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

Commit b1afce95 authored by David S. Miller's avatar David S. Miller
Browse files

ipv6: Protect ->mc_forwarding access with CONFIG_IPV6_MROUTE 



Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 193c1e47

net/ipv6/addrconf.c

+4 −1
Original line number Diff line number Diff line
@@ -469,8 +469,10 @@ static int inet6_netconf_msgsize_devconf(int type) 
	/* type -1 is used for ALL */

	if (type == -1 || type == NETCONFA_FORWARDING)

		size += nla_total_size(4);

#ifdef CONFIG_IPV6_MROUTE

	if (type == -1 || type == NETCONFA_MC_FORWARDING)

		size += nla_total_size(4);

#endif



	return size;

}
@@ -498,11 +500,12 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex, 
	if ((type == -1 || type == NETCONFA_FORWARDING) &&

	    nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)

		goto nla_put_failure;

#ifdef CONFIG_IPV6_MROUTE

	if ((type == -1 || type == NETCONFA_MC_FORWARDING) &&

	    nla_put_s32(skb, NETCONFA_MC_FORWARDING,

			devconf->mc_forwarding) < 0)

		goto nla_put_failure;



#endif

	return nlmsg_end(skb, nlh);



nla_put_failure: