diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2015-07-14 16:35:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-15 21:33:40 -0700 |
| commit | 23a5a49c83dd8a7201a42e96d24238bde3547c11 (patch) | |
| tree | eeface61303e1c46b5472d1aeab3b148f19736b9 | |
| parent | 0fba37a3af03a7e74bf9e75473729adb98da49c3 (diff) | |
| download | blackbird-op-linux-23a5a49c83dd8a7201a42e96d24238bde3547c11.tar.gz blackbird-op-linux-23a5a49c83dd8a7201a42e96d24238bde3547c11.zip | |
ipvlan: ignore addresses from ipv6 autoconfiguration
Inet6addr notifier is atomic and runs in bh context without RTNL when
ipv6 receives router advertisement packet and performs autoconfiguration.
Proper fix still in discussion. Let's at least plug the bug.
v1: http://lkml.kernel.org/r/20150514135618.14062.1969.stgit@buzz
v2: http://lkml.kernel.org/r/20150703125840.24121.91556.stgit@buzz
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index e995bc501ee6..20b58bdecf75 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -655,6 +655,10 @@ static int ipvlan_addr6_event(struct notifier_block *unused, struct net_device *dev = (struct net_device *)if6->idev->dev; struct ipvl_dev *ipvlan = netdev_priv(dev); + /* FIXME IPv6 autoconf calls us from bh without RTNL */ + if (in_softirq()) + return NOTIFY_DONE; + if (!netif_is_ipvlan(dev)) return NOTIFY_DONE; |
