netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update
authorNathan Chancellor <natechancellor@gmail.com>
Wed, 27 May 2020 08:10:39 +0000 (01:10 -0700)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 27 May 2020 11:38:58 +0000 (13:38 +0200)
commit46c1e0621a72e0469ec4edfdb6ed4d387ec34f8a
tree542e66ee0d73ce0fa05d6646b89e8070cb24454e
parenta4976a3ef844c510ae9120290b23e9f3f47d6bce
netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update

Clang warns:

net/netfilter/nf_conntrack_core.c:2068:21: warning: variable 'ctinfo' is
uninitialized when used here [-Wuninitialized]
        nf_ct_set(skb, ct, ctinfo);
                           ^~~~~~
net/netfilter/nf_conntrack_core.c:2024:2: note: variable 'ctinfo' is
declared here
        enum ip_conntrack_info ctinfo;
        ^
1 warning generated.

nf_conntrack_update was split up into nf_conntrack_update and
__nf_conntrack_update, where the assignment of ctinfo is in
nf_conntrack_update but it is used in __nf_conntrack_update.

Pass the value of ctinfo from nf_conntrack_update to
__nf_conntrack_update so that uninitialized memory is not used
and everything works properly.

Fixes: ee04805ff54a ("netfilter: conntrack: make conntrack userspace helpers work again")
Link: https://github.com/ClangBuiltLinux/linux/issues/1039
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_core.c