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

Commit 954cc63f authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan Committed by Greg Kroah-Hartman
Browse files

netfilter: x_tables: Update remaining dereference to RCU 



commit 443d6e86f821a165fae3fc3fc13086d27ac140b1 upstream.

This fixes the dereference to fetch the RCU pointer when holding
the appropriate xtables lock.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Fixes: cc00bcaa5899 ("netfilter: x_tables: Switch synchronization to RCU")
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Reviewed-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c471355

net/ipv4/netfilter/arp_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ static int compat_get_entries(struct net *net, 
	xt_compat_lock(NFPROTO_ARP);

	t = xt_find_table_lock(net, NFPROTO_ARP, get.name);

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;

		const struct xt_table_info *private = xt_table_get_private_protected(t);

		struct xt_table_info info;



		ret = compat_table_info(private, &info);

net/ipv4/netfilter/ip_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -1619,7 +1619,7 @@ compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr, 
	xt_compat_lock(AF_INET);

	t = xt_find_table_lock(net, AF_INET, get.name);

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;

		const struct xt_table_info *private = xt_table_get_private_protected(t);

		struct xt_table_info info;

		ret = compat_table_info(private, &info);

		if (!ret && get.size == info.size)

net/ipv6/netfilter/ip6_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ compat_get_entries(struct net *net, struct compat_ip6t_get_entries __user *uptr, 
	xt_compat_lock(AF_INET6);

	t = xt_find_table_lock(net, AF_INET6, get.name);

	if (!IS_ERR(t)) {

		const struct xt_table_info *private = t->private;

		const struct xt_table_info *private = xt_table_get_private_protected(t);

		struct xt_table_info info;

		ret = compat_table_info(private, &info);

		if (!ret && get.size == info.size)