Commit 7a075390 authored May 27, 2020 by Nathan Chancellor Committed by Greg Kroah-Hartman Jun 03, 2020

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>

parent 987de40b

net/netfilter/nf_conntrack_core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1880,11 +1880,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;
		@@ -2009,7 +2009,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;
		}