Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ipv6: fix the check when handle RA

d9333196572(ipv6: Allow accepting RA from local IP addresses.) made the wrong
check, whether or not to accept RA with source-addr found on local machine, when
accept_ra_from_local is 0.

Fixes: d9333196572(ipv6: Allow accepting RA from local IP addresses.)
Cc: Ben Greear <greearb@candelatech.com>
Cc: Hannes Frederic Sowa <hannes@redhat.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Li RongQing and committed by
David S. Miller
b6428817 ff32045e

+6 -6
+6 -6
net/ipv6/ndisc.c
··· 1151 1151 /* Do not accept RA with source-addr found on local machine unless 1152 1152 * accept_ra_from_local is set to true. 1153 1153 */ 1154 - if (!(in6_dev->cnf.accept_ra_from_local || 1155 - ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, 1156 - NULL, 0))) { 1154 + if (!in6_dev->cnf.accept_ra_from_local && 1155 + ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, 1156 + NULL, 0)) { 1157 1157 ND_PRINTK(2, info, 1158 1158 "RA from local address detected on dev: %s: default router ignored\n", 1159 1159 skb->dev->name); ··· 1294 1294 } 1295 1295 1296 1296 #ifdef CONFIG_IPV6_ROUTE_INFO 1297 - if (!(in6_dev->cnf.accept_ra_from_local || 1298 - ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, 1299 - NULL, 0))) { 1297 + if (!in6_dev->cnf.accept_ra_from_local && 1298 + ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, 1299 + NULL, 0)) { 1300 1300 ND_PRINTK(2, info, 1301 1301 "RA from local address detected on dev: %s: router info ignored.\n", 1302 1302 skb->dev->name);