Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99e25d07 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: cttimeout: ctnl_timeout_find_get() returns incorrect pointer to type 



Compiler did not catch incorrect typing in the rcu hook assignment.

 % nfct add timeout test-tcp inet tcp established 100 close 10 close_wait 10
 % iptables -I OUTPUT -t raw -p tcp -j CT --timeout test-tcp
 dmesg - xt_CT: Timeout policy `test-tcp' can only be used by L3 protocol number 25000

The CT target bails out with incorrect layer 3 protocol number.

Fixes: 6c1fd7dc ("netfilter: cttimeout: decouple timeout policy from nfnetlink_cttimeout object")
Reported-by: default avatarHarsha Sharma <harshasharmaiitr@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a874752a

net/netfilter/nfnetlink_cttimeout.c

+3 −3
Original line number Diff line number Diff line
@@ -489,8 +489,8 @@ static int cttimeout_default_get(struct net *net, struct sock *ctnl, 
	return err;

}



static struct ctnl_timeout *

ctnl_timeout_find_get(struct net *net, const char *name)

static struct nf_ct_timeout *ctnl_timeout_find_get(struct net *net,

						   const char *name)

{

	struct ctnl_timeout *timeout, *matching = NULL;
@@ -509,7 +509,7 @@ ctnl_timeout_find_get(struct net *net, const char *name) 
		break;

	}

err:

	return matching;

	return matching ? &matching->timeout : NULL;

}



static void ctnl_timeout_put(struct nf_ct_timeout *t)