| Message ID | 20201120093057.1477009-1-yangyingliang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | veth: fix memleak in veth_newlink() | expand |
On 2020/11/20 18:30, Yang Yingliang wrote: Hi, > I got a memleak report when doing fault-inject test: > > unreferenced object 0xffff88810ace9000 (size 1024): > comm "ip", pid 4622, jiffies 4295457037 (age 43.378s) > hex dump (first 32 bytes): > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > backtrace: > [<00000000008abe41>] __kmalloc+0x10f/0x210 > [<000000005d3533a6>] veth_dev_init+0x140/0x310 > [<0000000088353c64>] register_netdevice+0x496/0x7a0 > [<000000001324d322>] veth_newlink+0x40b/0x960 > [<00000000d0799866>] __rtnl_newlink+0xd8c/0x1360 > [<00000000d616040a>] rtnl_newlink+0x6b/0xa0 > [<00000000e0a1600d>] rtnetlink_rcv_msg+0x3cc/0x9e0 > [<000000009eeff98b>] netlink_rcv_skb+0x130/0x3a0 > [<00000000500f8be1>] netlink_unicast+0x4da/0x700 > [<00000000666c03b3>] netlink_sendmsg+0x7fe/0xcb0 > [<0000000073b28103>] sock_sendmsg+0x143/0x180 > [<00000000ad746a30>] ____sys_sendmsg+0x677/0x810 > [<0000000087dd98e5>] ___sys_sendmsg+0x105/0x180 > [<00000000028dd365>] __sys_sendmsg+0xf0/0x1c0 > [<00000000a6bfbae6>] do_syscall_64+0x33/0x40 > [<00000000e00521b4>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 > > If call_netdevice_notifiers() failed in register_netdevice(), > dev->priv_destructor() is not called, it will cause memleak. > Fix this by assigning ndo_uninit with veth_dev_free(), so > the memory can be freed in rollback_registered(); We have discussed this before and it seems we should fix register_netdevice() rather than each driver. https://patchwork.ozlabs.org/project/netdev/patch/20200830131336.275844-1-rkovhaev@gmail.com/ Toshiaki Makita
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 8c737668008a..537d9a60028a 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1217,6 +1217,7 @@ static int veth_xdp(struct net_device *dev, struct netdev_bpf *xdp) static const struct net_device_ops veth_netdev_ops = { .ndo_init = veth_dev_init, + .ndo_uninit = veth_dev_free, .ndo_open = veth_open, .ndo_stop = veth_close, .ndo_start_xmit = veth_xmit, @@ -1260,7 +1261,6 @@ static void veth_setup(struct net_device *dev) NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX); dev->needs_free_netdev = true; - dev->priv_destructor = veth_dev_free; dev->max_mtu = ETH_MAX_MTU; dev->hw_features = VETH_FEATURES;
I got a memleak report when doing fault-inject test: unreferenced object 0xffff88810ace9000 (size 1024): comm "ip", pid 4622, jiffies 4295457037 (age 43.378s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000008abe41>] __kmalloc+0x10f/0x210 [<000000005d3533a6>] veth_dev_init+0x140/0x310 [<0000000088353c64>] register_netdevice+0x496/0x7a0 [<000000001324d322>] veth_newlink+0x40b/0x960 [<00000000d0799866>] __rtnl_newlink+0xd8c/0x1360 [<00000000d616040a>] rtnl_newlink+0x6b/0xa0 [<00000000e0a1600d>] rtnetlink_rcv_msg+0x3cc/0x9e0 [<000000009eeff98b>] netlink_rcv_skb+0x130/0x3a0 [<00000000500f8be1>] netlink_unicast+0x4da/0x700 [<00000000666c03b3>] netlink_sendmsg+0x7fe/0xcb0 [<0000000073b28103>] sock_sendmsg+0x143/0x180 [<00000000ad746a30>] ____sys_sendmsg+0x677/0x810 [<0000000087dd98e5>] ___sys_sendmsg+0x105/0x180 [<00000000028dd365>] __sys_sendmsg+0xf0/0x1c0 [<00000000a6bfbae6>] do_syscall_64+0x33/0x40 [<00000000e00521b4>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 If call_netdevice_notifiers() failed in register_netdevice(), dev->priv_destructor() is not called, it will cause memleak. Fix this by assigning ndo_uninit with veth_dev_free(), so the memory can be freed in rollback_registered(); Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/veth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)