Skip to content

Commit 49c8d2c

Browse files
leitaokuba-moo
authored andcommitted
net: netpoll: fix incorrect refcount handling causing incorrect cleanup
commit efa95b0 ("netpoll: fix use after free") incorrectly ignored the refcount and prematurely set dev->npinfo to NULL during netpoll cleanup, leading to improper behavior and memory leaks. Scenario causing lack of proper cleanup: 1) A netpoll is associated with a NIC (e.g., eth0) and netdev->npinfo is allocated, and refcnt = 1 - Keep in mind that npinfo is shared among all netpoll instances. In this case, there is just one. 2) Another netpoll is also associated with the same NIC and npinfo->refcnt += 1. - Now dev->npinfo->refcnt = 2; - There is just one npinfo associated to the netdev. 3) When the first netpolls goes to clean up: - The first cleanup succeeds and clears np->dev->npinfo, ignoring refcnt. - It basically calls `RCU_INIT_POINTER(np->dev->npinfo, NULL);` - Set dev->npinfo = NULL, without proper cleanup - No ->ndo_netpoll_cleanup() is either called 4) Now the second target tries to clean up - The second cleanup fails because np->dev->npinfo is already NULL. * In this case, ops->ndo_netpoll_cleanup() was never called, and the skb pool is not cleaned as well (for the second netpoll instance) - This leaks npinfo and skbpool skbs, which is clearly reported by kmemleak. Revert commit efa95b0 ("netpoll: fix use after free") and adds clarifying comments emphasizing that npinfo cleanup should only happen once the refcount reaches zero, ensuring stable and correct netpoll behavior. Cc: <stable@vger.kernel.org> # 3.17.x Cc: Jay Vosburgh <jv@jvosburgh.net> Fixes: efa95b0 ("netpoll: fix use after free") Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20251107-netconsole_torture-v10-1-749227b55f63@debian.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent e6ca8f5 commit 49c8d2c

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

net/core/netpoll.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,10 @@ static void __netpoll_cleanup(struct netpoll *np)
811811
if (!npinfo)
812812
return;
813813

814+
/* At this point, there is a single npinfo instance per netdevice, and
815+
* its refcnt tracks how many netpoll structures are linked to it. We
816+
* only perform npinfo cleanup when the refcnt decrements to zero.
817+
*/
814818
if (refcount_dec_and_test(&npinfo->refcnt)) {
815819
const struct net_device_ops *ops;
816820

@@ -820,8 +824,7 @@ static void __netpoll_cleanup(struct netpoll *np)
820824

821825
RCU_INIT_POINTER(np->dev->npinfo, NULL);
822826
call_rcu(&npinfo->rcu, rcu_cleanup_netpoll_info);
823-
} else
824-
RCU_INIT_POINTER(np->dev->npinfo, NULL);
827+
}
825828

826829
skb_pool_flush(np);
827830
}

0 commit comments

Comments
 (0)