The patch titled
netpoll: fix a leak-n-bug in netpoll_cleanup()
has been added to the -mm tree. Its filename is
netpoll-fix-a-leak-n-bug-in-netpoll_cleanup.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: netpoll: fix a leak-n-bug in netpoll_cleanup()
From: Satyam Sharma <ssatyam@xxxxxxxxxxxxxx>
93ec2c723e3f8a216dde2899aeb85c648672bc6b applied excessive duct tape to the
netpoll beast's netpoll_cleanup(), thus substituting one leak with another,
and opening up a little buglet :-)
net_device->npinfo (netpoll_info) is a shared and refcounted object and
cannot simply be set NULL the first time netpoll_cleanup() is called.
Otherwise, further netpoll_cleanup()'s see np->dev->npinfo == NULL and
become no-ops, thus leaking. And it's a bug too: the first call to
netpoll_cleanup() would thus (annoyingly) "disable" other (still alive)
netpolls too. Maybe nobody noticed this because netconsole (only user of
netpoll) never supported multiple netpoll objects earlier.
This is a trivial and obvious one-line fixlet.
Signed-off-by: Satyam Sharma <ssatyam@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/core/netpoll.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN net/core/netpoll.c~netpoll-fix-a-leak-n-bug-in-netpoll_cleanup net/core/netpoll.c
--- a/net/core/netpoll.c~netpoll-fix-a-leak-n-bug-in-netpoll_cleanup
+++ a/net/core/netpoll.c
@@ -785,7 +785,6 @@ void netpoll_cleanup(struct netpoll *np)
spin_unlock_irqrestore(&npinfo->rx_lock, flags);
}
- np->dev->npinfo = NULL;
if (atomic_dec_and_test(&npinfo->refcnt)) {
skb_queue_purge(&npinfo->arp_tx);
skb_queue_purge(&npinfo->txq);
@@ -799,6 +798,7 @@ void netpoll_cleanup(struct netpoll *np)
kfree_skb(skb);
}
kfree(npinfo);
+ np->dev->npinfo = NULL;
}
}
_
Patches currently in -mm which might be from ssatyam@xxxxxxxxxxxxxx are
git-gfs2-nmw.patch
git-ocfs2.patch
drivers-message-i2o-devicec-remove-redundant-gfp_atomic-from-kmalloc.patch
drivers-scsi-aic7xxx_oldc-remove-redundant-gfp_atomic-from-kmalloc.patch
netpoll-fix-a-leak-n-bug-in-netpoll_cleanup.patch
introduce-write_trylock_irqsave.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
