Skip to content

Commit 3e86840

Browse files
leitaoopsiff
authored andcommitted
net: netpoll: fix incorrect refcount handling causing incorrect cleanup
[ Upstream commit 49c8d2c ] 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: <[email protected]> # 3.17.x Cc: Jay Vosburgh <[email protected]> Fixes: efa95b0 ("netpoll: fix use after free") Signed-off-by: Breno Leitao <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit c79a6d9da29219616b118a3adce9a14cd30f9bd0) Signed-off-by: Wentao Guan <[email protected]>
1 parent 237c6c0 commit 3e86840

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

net/core/netpoll.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,10 @@ void __netpoll_cleanup(struct netpoll *np)
841841
if (!npinfo)
842842
return;
843843

844+
/* At this point, there is a single npinfo instance per netdevice, and
845+
* its refcnt tracks how many netpoll structures are linked to it. We
846+
* only perform npinfo cleanup when the refcnt decrements to zero.
847+
*/
844848
if (refcount_dec_and_test(&npinfo->refcnt)) {
845849
const struct net_device_ops *ops;
846850

@@ -850,8 +854,7 @@ void __netpoll_cleanup(struct netpoll *np)
850854

851855
RCU_INIT_POINTER(np->dev->npinfo, NULL);
852856
call_rcu(&npinfo->rcu, rcu_cleanup_netpoll_info);
853-
} else
854-
RCU_INIT_POINTER(np->dev->npinfo, NULL);
857+
}
855858

856859
skb_pool_flush(np);
857860
}

0 commit comments

Comments
 (0)