Skip to content

Commit 755a884

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: <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> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit c645693180a98606c430825223d2029315d85e9d) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 70ca461 commit 755a884

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
@@ -843,6 +843,10 @@ void __netpoll_cleanup(struct netpoll *np)
843843
if (!npinfo)
844844
return;
845845

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

@@ -852,8 +856,7 @@ void __netpoll_cleanup(struct netpoll *np)
852856

853857
RCU_INIT_POINTER(np->dev->npinfo, NULL);
854858
call_rcu(&npinfo->rcu, rcu_cleanup_netpoll_info);
855-
} else
856-
RCU_INIT_POINTER(np->dev->npinfo, NULL);
859+
}
857860

858861
skb_pool_flush(np);
859862
}

0 commit comments

Comments
 (0)