]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
vlan: fix a use-after-free in vlan_device_event()
authorCong Wang <xiyou.wangcong@gmail.com>
Fri, 10 Nov 2017 00:43:13 +0000 (16:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Nov 2017 10:35:32 +0000 (19:35 +0900)
commit052d41c01b3a2e3371d66de569717353af489d63
tree995570b6b32fea4c07ac142f608f40c6b2baa9fa
parent2118df93b5e1742931da358c2b8804c46fd64490
vlan: fix a use-after-free in vlan_device_event()

After refcnt reaches zero, vlan_vid_del() could free
dev->vlan_info via RCU:

RCU_INIT_POINTER(dev->vlan_info, NULL);
call_rcu(&vlan_info->rcu, vlan_info_rcu_free);

However, the pointer 'grp' still points to that memory
since it is set before vlan_vid_del():

        vlan_info = rtnl_dereference(dev->vlan_info);
        if (!vlan_info)
                goto out;
        grp = &vlan_info->grp;

Depends on when that RCU callback is scheduled, we could
trigger a use-after-free in vlan_group_for_each_dev()
right following this vlan_vid_del().

Fix it by moving vlan_vid_del() before setting grp. This
is also symmetric to the vlan_vid_add() we call in
vlan_device_event().

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Fixes: efc73f4bbc23 ("net: Fix memory leak - vlan_info struct")
Cc: Alexander Duyck <alexander.duyck@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Girish Moodalbail <girish.moodalbail@oracle.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: Girish Moodalbail <girish.moodalbail@oracle.com>
Tested-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/8021q/vlan.c