* [PATCH] ibmveth: Fix leak when recycling skb and hypervisor returns error
@ 2011-08-24 23:20 Anton Blanchard
2011-08-25 0:43 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Anton Blanchard @ 2011-08-24 23:20 UTC (permalink / raw)
To: santil; +Cc: netdev
If h_add_logical_lan_buffer returns an error we need to free
the skb.
Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: stable <stable@kernel.org>
---
Index: linux-net/drivers/net/ethernet/ibm/ibmveth.c
===================================================================
--- linux-net.orig/drivers/net/ethernet/ibm/ibmveth.c 2011-08-24 17:06:56.894207820 +1000
+++ linux-net/drivers/net/ethernet/ibm/ibmveth.c 2011-08-25 08:44:14.212105871 +1000
@@ -395,7 +395,7 @@ static inline struct sk_buff *ibmveth_rx
}
/* recycle the current buffer on the rx queue */
-static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
+static int ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
{
u32 q_index = adapter->rx_queue.index;
u64 correlator = adapter->rx_queue.queue_addr[q_index].correlator;
@@ -403,6 +403,7 @@ static void ibmveth_rxq_recycle_buffer(s
unsigned int index = correlator & 0xffffffffUL;
union ibmveth_buf_desc desc;
unsigned long lpar_rc;
+ int ret = 1;
BUG_ON(pool >= IBMVETH_NUM_BUFF_POOLS);
BUG_ON(index >= adapter->rx_buff_pool[pool].size);
@@ -410,7 +411,7 @@ static void ibmveth_rxq_recycle_buffer(s
if (!adapter->rx_buff_pool[pool].active) {
ibmveth_rxq_harvest_buffer(adapter);
ibmveth_free_buffer_pool(adapter, &adapter->rx_buff_pool[pool]);
- return;
+ goto out;
}
desc.fields.flags_len = IBMVETH_BUF_VALID |
@@ -423,12 +424,16 @@ static void ibmveth_rxq_recycle_buffer(s
netdev_dbg(adapter->netdev, "h_add_logical_lan_buffer failed "
"during recycle rc=%ld", lpar_rc);
ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
+ ret = 0;
}
if (++adapter->rx_queue.index == adapter->rx_queue.num_slots) {
adapter->rx_queue.index = 0;
adapter->rx_queue.toggle = !adapter->rx_queue.toggle;
}
+
+out:
+ return ret;
}
static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
@@ -1084,8 +1089,9 @@ restart_poll:
if (rx_flush)
ibmveth_flush_buffer(skb->data,
length + offset);
+ if (!ibmveth_rxq_recycle_buffer(adapter))
+ kfree_skb(skb);
skb = new_skb;
- ibmveth_rxq_recycle_buffer(adapter);
} else {
ibmveth_rxq_harvest_buffer(adapter);
skb_reserve(skb, offset);
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ibmveth: Fix leak when recycling skb and hypervisor returns error
2011-08-24 23:20 [PATCH] ibmveth: Fix leak when recycling skb and hypervisor returns error Anton Blanchard
@ 2011-08-25 0:43 ` David Miller
2011-08-25 0:55 ` Anton Blanchard
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2011-08-25 0:43 UTC (permalink / raw)
To: anton; +Cc: santil, netdev
From: Anton Blanchard <anton@samba.org>
Date: Thu, 25 Aug 2011 09:20:19 +1000
> If h_add_logical_lan_buffer returns an error we need to free
> the skb.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>
> Cc: stable <stable@kernel.org>
Please generate this patch against Linus's tree, instead of -next
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ibmveth: Fix leak when recycling skb and hypervisor returns error
2011-08-25 0:43 ` David Miller
@ 2011-08-25 0:55 ` Anton Blanchard
2011-08-25 0:56 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Anton Blanchard @ 2011-08-25 0:55 UTC (permalink / raw)
To: David Miller; +Cc: santil, netdev
Hi Dave,
> Please generate this patch against Linus's tree, instead of -next
Sure, here it is.
Anton
--
If h_add_logical_lan_buffer returns an error we need to free
the skb.
Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: stable <stable@kernel.org>
---
Index: linux-2.6-work/drivers/net/ibmveth.c
===================================================================
--- linux-2.6-work.orig/drivers/net/ibmveth.c 2011-07-31 20:45:29.729141545 +1000
+++ linux-2.6-work/drivers/net/ibmveth.c 2011-08-25 10:49:04.200718870 +1000
@@ -395,7 +395,7 @@ static inline struct sk_buff *ibmveth_rx
}
/* recycle the current buffer on the rx queue */
-static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
+static int ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
{
u32 q_index = adapter->rx_queue.index;
u64 correlator = adapter->rx_queue.queue_addr[q_index].correlator;
@@ -403,6 +403,7 @@ static void ibmveth_rxq_recycle_buffer(s
unsigned int index = correlator & 0xffffffffUL;
union ibmveth_buf_desc desc;
unsigned long lpar_rc;
+ int ret = 1;
BUG_ON(pool >= IBMVETH_NUM_BUFF_POOLS);
BUG_ON(index >= adapter->rx_buff_pool[pool].size);
@@ -410,7 +411,7 @@ static void ibmveth_rxq_recycle_buffer(s
if (!adapter->rx_buff_pool[pool].active) {
ibmveth_rxq_harvest_buffer(adapter);
ibmveth_free_buffer_pool(adapter, &adapter->rx_buff_pool[pool]);
- return;
+ goto out;
}
desc.fields.flags_len = IBMVETH_BUF_VALID |
@@ -423,12 +424,16 @@ static void ibmveth_rxq_recycle_buffer(s
netdev_dbg(adapter->netdev, "h_add_logical_lan_buffer failed "
"during recycle rc=%ld", lpar_rc);
ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
+ ret = 0;
}
if (++adapter->rx_queue.index == adapter->rx_queue.num_slots) {
adapter->rx_queue.index = 0;
adapter->rx_queue.toggle = !adapter->rx_queue.toggle;
}
+
+out:
+ return ret;
}
static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
@@ -1084,8 +1089,9 @@ restart_poll:
if (rx_flush)
ibmveth_flush_buffer(skb->data,
length + offset);
+ if (!ibmveth_rxq_recycle_buffer(adapter))
+ kfree_skb(skb);
skb = new_skb;
- ibmveth_rxq_recycle_buffer(adapter);
} else {
ibmveth_rxq_harvest_buffer(adapter);
skb_reserve(skb, offset);
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-25 0:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-24 23:20 [PATCH] ibmveth: Fix leak when recycling skb and hypervisor returns error Anton Blanchard
2011-08-25 0:43 ` David Miller
2011-08-25 0:55 ` Anton Blanchard
2011-08-25 0:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox