Skip to content

Commit 7c31e54

Browse files
TaeheeYoodavem330
authored andcommitted
vxlan: do not destroy fdb if register_netdevice() is failed
__vxlan_dev_create() destroys FDB using specific pointer which indicates a fdb when error occurs. But that pointer should not be used when register_netdevice() fails because register_netdevice() internally destroys fdb when error occurs. This patch makes vxlan_fdb_create() to do not link fdb entry to vxlan dev internally. Instead, a new function vxlan_fdb_insert() is added to link fdb to vxlan dev. vxlan_fdb_insert() is called after calling register_netdevice(). This routine can avoid situation that ->ndo_uninit() destroys fdb entry in error path of register_netdevice(). Hence, error path of __vxlan_dev_create() routine can have an opportunity to destroy default fdb entry by hand. Test command ip link add bonding_masters type vxlan id 0 group 239.1.1.1 \ dev enp0s9 dstport 4789 Splat looks like: [ 213.392816] kasan: GPF could be caused by NULL-ptr deref or user memory access [ 213.401257] general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI [ 213.402178] CPU: 0 PID: 1414 Comm: ip Not tainted 5.2.0-rc5+ #256 [ 213.402178] RIP: 0010:vxlan_fdb_destroy+0x120/0x220 [vxlan] [ 213.402178] Code: df 48 8b 2b 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 06 01 00 00 4c 8b 63 08 48 b8 00 00 00 00 00 fc d [ 213.402178] RSP: 0018:ffff88810cb9f0a0 EFLAGS: 00010202 [ 213.402178] RAX: dffffc0000000000 RBX: ffff888101d4a8c8 RCX: 0000000000000000 [ 213.402178] RDX: 1bd5a00000000040 RSI: ffff888101d4a8c8 RDI: ffff888101d4a8d0 [ 213.402178] RBP: 0000000000000000 R08: fffffbfff22b72d9 R09: 0000000000000000 [ 213.402178] R10: 00000000ffffffef R11: 0000000000000000 R12: dead000000000200 [ 213.402178] R13: ffff88810cb9f1f8 R14: ffff88810efccda0 R15: ffff88810efccda0 [ 213.402178] FS: 00007f7f6621a0c0(0000) GS:ffff88811b000000(0000) knlGS:0000000000000000 [ 213.402178] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 213.402178] CR2: 000055746f0807d0 CR3: 00000001123e0000 CR4: 00000000001006f0 [ 213.402178] Call Trace: [ 213.402178] __vxlan_dev_create+0x3a9/0x7d0 [vxlan] [ 213.402178] ? vxlan_changelink+0x740/0x740 [vxlan] [ 213.402178] ? rcu_read_unlock+0x60/0x60 [vxlan] [ 213.402178] ? __kasan_kmalloc.constprop.3+0xa0/0xd0 [ 213.402178] vxlan_newlink+0x8d/0xc0 [vxlan] [ 213.402178] ? __vxlan_dev_create+0x7d0/0x7d0 [vxlan] [ 213.554119] ? __netlink_ns_capable+0xc3/0xf0 [ 213.554119] __rtnl_newlink+0xb75/0x1180 [ 213.554119] ? rtnl_link_unregister+0x230/0x230 [ ... ] Fixes: 0241b83 ("vxlan: fix default fdb entry netlink notify ordering during netdev create") Suggested-by: Roopa Prabhu <[email protected]> Signed-off-by: Taehee Yoo <[email protected]> Acked-by: Roopa Prabhu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4d14158 commit 7c31e54

File tree

1 file changed

+27
-10
lines changed

1 file changed

+27
-10
lines changed

drivers/net/vxlan.c

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,14 @@ static struct vxlan_fdb *vxlan_fdb_alloc(struct vxlan_dev *vxlan,
804804
return f;
805805
}
806806

807+
static void vxlan_fdb_insert(struct vxlan_dev *vxlan, const u8 *mac,
808+
__be32 src_vni, struct vxlan_fdb *f)
809+
{
810+
++vxlan->addrcnt;
811+
hlist_add_head_rcu(&f->hlist,
812+
vxlan_fdb_head(vxlan, mac, src_vni));
813+
}
814+
807815
static int vxlan_fdb_create(struct vxlan_dev *vxlan,
808816
const u8 *mac, union vxlan_addr *ip,
809817
__u16 state, __be16 port, __be32 src_vni,
@@ -829,18 +837,13 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
829837
return rc;
830838
}
831839

832-
++vxlan->addrcnt;
833-
hlist_add_head_rcu(&f->hlist,
834-
vxlan_fdb_head(vxlan, mac, src_vni));
835-
836840
*fdb = f;
837841

838842
return 0;
839843
}
840844

841-
static void vxlan_fdb_free(struct rcu_head *head)
845+
static void __vxlan_fdb_free(struct vxlan_fdb *f)
842846
{
843-
struct vxlan_fdb *f = container_of(head, struct vxlan_fdb, rcu);
844847
struct vxlan_rdst *rd, *nd;
845848

846849
list_for_each_entry_safe(rd, nd, &f->remotes, list) {
@@ -850,6 +853,13 @@ static void vxlan_fdb_free(struct rcu_head *head)
850853
kfree(f);
851854
}
852855

856+
static void vxlan_fdb_free(struct rcu_head *head)
857+
{
858+
struct vxlan_fdb *f = container_of(head, struct vxlan_fdb, rcu);
859+
860+
__vxlan_fdb_free(f);
861+
}
862+
853863
static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f,
854864
bool do_notify, bool swdev_notify)
855865
{
@@ -977,6 +987,7 @@ static int vxlan_fdb_update_create(struct vxlan_dev *vxlan,
977987
if (rc < 0)
978988
return rc;
979989

990+
vxlan_fdb_insert(vxlan, mac, src_vni, f);
980991
rc = vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f), RTM_NEWNEIGH,
981992
swdev_notify, extack);
982993
if (rc)
@@ -3571,12 +3582,17 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev,
35713582
if (err)
35723583
goto errout;
35733584

3574-
/* notify default fdb entry */
35753585
if (f) {
3586+
vxlan_fdb_insert(vxlan, all_zeros_mac,
3587+
vxlan->default_dst.remote_vni, f);
3588+
3589+
/* notify default fdb entry */
35763590
err = vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f),
35773591
RTM_NEWNEIGH, true, extack);
3578-
if (err)
3579-
goto errout;
3592+
if (err) {
3593+
vxlan_fdb_destroy(vxlan, f, false, false);
3594+
goto unregister;
3595+
}
35803596
}
35813597

35823598
list_add(&vxlan->next, &vn->vxlan_list);
@@ -3588,7 +3604,8 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev,
35883604
* destroy the entry by hand here.
35893605
*/
35903606
if (f)
3591-
vxlan_fdb_destroy(vxlan, f, false, false);
3607+
__vxlan_fdb_free(f);
3608+
unregister:
35923609
if (unregister)
35933610
unregister_netdevice(dev);
35943611
return err;

0 commit comments

Comments
 (0)