netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net] virtio-net: fix page refcnt leaking when fail to allocate frag skb
@ 2013-11-19  8:05 Jason Wang
  2013-11-19 14:03 ` Eric Dumazet
  0 siblings, 1 reply; 19+ messages in thread
From: Jason Wang @ 2013-11-19  8:05 UTC (permalink / raw)
  To: rusty, mst, virtualization, netdev, linux-kernel
  Cc: Michael Dalton, Eric Dumazet

We need to drop the refcnt of page when we fail to allocate an skb for frag
list, otherwise it will be leaked. The bug was introduced by commit
2613af0ed18a11d5c566a81f9a6510b73180660a ("virtio_net: migrate mergeable rx
buffers to page frag allocators").

Cc: Michael Dalton <mwdalton@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
The patch was needed for 3.12 stable.
---
 drivers/net/virtio_net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 69ad42b..3798517 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -322,9 +322,11 @@ static int receive_mergeable(struct receive_queue *rq, struct sk_buff *head_skb)
 				 head_skb->dev->name);
 			len = MERGE_BUFFER_LEN;
 		}
+		page = virt_to_head_page(buf);
 		if (unlikely(num_skb_frags == MAX_SKB_FRAGS)) {
 			struct sk_buff *nskb = alloc_skb(0, GFP_ATOMIC);
 			if (unlikely(!nskb)) {
+				put_page(page);
 				head_skb->dev->stats.rx_dropped++;
 				return -ENOMEM;
 			}
@@ -341,7 +343,6 @@ static int receive_mergeable(struct receive_queue *rq, struct sk_buff *head_skb)
 			head_skb->len += len;
 			head_skb->truesize += MERGE_BUFFER_LEN;
 		}
-		page = virt_to_head_page(buf);
 		offset = buf - (char *)page_address(page);
 		if (skb_can_coalesce(curr_skb, num_skb_frags, page, offset)) {
 			put_page(page);
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2013-11-20 17:03 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-19  8:05 [PATCH net] virtio-net: fix page refcnt leaking when fail to allocate frag skb Jason Wang
2013-11-19 14:03 ` Eric Dumazet
2013-11-19 18:44   ` Michael S. Tsirkin
2013-11-19 20:49   ` Michael S. Tsirkin
2013-11-19 21:36     ` Eric Dumazet
2013-11-19 21:53       ` Michael S. Tsirkin
2013-11-19 22:00         ` Eric Dumazet
2013-11-20  1:34           ` Michael Dalton
2013-11-20  3:17             ` Jason Wang
2013-11-20  9:00             ` Michael S. Tsirkin
2013-11-20  8:58           ` Michael S. Tsirkin
2013-11-20 15:16             ` Eric Dumazet
2013-11-20 16:06               ` Michael S. Tsirkin
2013-11-20 16:14                 ` Eric Dumazet
2013-11-20 17:03                   ` Michael S. Tsirkin
2013-11-19 21:38     ` Michael Dalton
2013-11-20  9:06       ` Michael S. Tsirkin
2013-11-20  3:05     ` Jason Wang
2013-11-20  3:00   ` Jason Wang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).