ipv6: Protect ->mc_forwarding access with CONFIG_IPV6_MROUTE
Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
193c1e478c
commit
b1afce9538
|
@ -469,8 +469,10 @@ static int inet6_netconf_msgsize_devconf(int type)
|
||||||
/* type -1 is used for ALL */
|
/* type -1 is used for ALL */
|
||||||
if (type == -1 || type == NETCONFA_FORWARDING)
|
if (type == -1 || type == NETCONFA_FORWARDING)
|
||||||
size += nla_total_size(4);
|
size += nla_total_size(4);
|
||||||
|
#ifdef CONFIG_IPV6_MROUTE
|
||||||
if (type == -1 || type == NETCONFA_MC_FORWARDING)
|
if (type == -1 || type == NETCONFA_MC_FORWARDING)
|
||||||
size += nla_total_size(4);
|
size += nla_total_size(4);
|
||||||
|
#endif
|
||||||
|
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
@ -498,11 +500,12 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
|
||||||
if ((type == -1 || type == NETCONFA_FORWARDING) &&
|
if ((type == -1 || type == NETCONFA_FORWARDING) &&
|
||||||
nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)
|
nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
#ifdef CONFIG_IPV6_MROUTE
|
||||||
if ((type == -1 || type == NETCONFA_MC_FORWARDING) &&
|
if ((type == -1 || type == NETCONFA_MC_FORWARDING) &&
|
||||||
nla_put_s32(skb, NETCONFA_MC_FORWARDING,
|
nla_put_s32(skb, NETCONFA_MC_FORWARDING,
|
||||||
devconf->mc_forwarding) < 0)
|
devconf->mc_forwarding) < 0)
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
#endif
|
||||||
return nlmsg_end(skb, nlh);
|
return nlmsg_end(skb, nlh);
|
||||||
|
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
|
|
Loading…
Reference in a new issue