netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update

commit 46c1e0621a72e0469ec4edfdb6ed4d387ec34f8a upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 7f66117271a7730e1850d42bed5ae60fb94a873e..7c503b4751c4c5d0207699914de3709bb1f1b96e 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2015,11 +2015,11 @@ static void nf_conntrack_attach(struct sk_buff *nskb, const struct sk_buff *skb)
 }
 
 static int __nf_conntrack_update(struct net *net, struct sk_buff *skb,
-                                struct nf_conn *ct)
+                                struct nf_conn *ct,
+                                enum ip_conntrack_info ctinfo)
 {
        struct nf_conntrack_tuple_hash *h;
        struct nf_conntrack_tuple tuple;
-       enum ip_conntrack_info ctinfo;
        struct nf_nat_hook *nat_hook;
        unsigned int status;
        int dataoff;
@@ -2144,7 +2144,7 @@ static int nf_conntrack_update(struct net *net, struct sk_buff *skb)
                return 0;
 
        if (!nf_ct_is_confirmed(ct)) {
-               err = __nf_conntrack_update(net, skb, ct);
+               err = __nf_conntrack_update(net, skb, ct, ctinfo);
                if (err < 0)
                        return err;
        }