* [dpdk-stable] [PATCH] net/sfc: fix leak if EvQ DMA space allocation fails
@ 2017-03-29 8:28 Andrew Rybchenko
2017-03-30 16:47 ` Ferruh Yigit
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Rybchenko @ 2017-03-29 8:28 UTC (permalink / raw)
To: dev; +Cc: stable
Fixes: 58294ee65afb ("net/sfc: support event queue")
Cc: stable@dpdk.org
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/sfc_ev.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index 24071b2..800b08e 100644
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -800,10 +800,11 @@ sfc_ev_qinit(struct sfc_adapter *sa, unsigned int sw_index,
SFC_ASSERT(entries <= evq_info->max_entries);
evq_info->entries = entries;
+ rc = ENOMEM;
evq = rte_zmalloc_socket("sfc-evq", sizeof(*evq), RTE_CACHE_LINE_SIZE,
socket_id);
if (evq == NULL)
- return ENOMEM;
+ goto fail_evq_alloc;
evq->sa = sa;
evq->evq_index = sw_index;
@@ -812,13 +813,21 @@ sfc_ev_qinit(struct sfc_adapter *sa, unsigned int sw_index,
rc = sfc_dma_alloc(sa, "evq", sw_index, EFX_EVQ_SIZE(evq_info->entries),
socket_id, &evq->mem);
if (rc != 0)
- return rc;
+ goto fail_dma_alloc;
evq->init_state = SFC_EVQ_INITIALIZED;
evq_info->evq = evq;
return 0;
+
+fail_dma_alloc:
+ rte_free(evq);
+
+fail_evq_alloc:
+
+ sfc_log_init(sa, "failed %d", rc);
+ return rc;
}
void
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-stable] [PATCH] net/sfc: fix leak if EvQ DMA space allocation fails
2017-03-29 8:28 [dpdk-stable] [PATCH] net/sfc: fix leak if EvQ DMA space allocation fails Andrew Rybchenko
@ 2017-03-30 16:47 ` Ferruh Yigit
0 siblings, 0 replies; 2+ messages in thread
From: Ferruh Yigit @ 2017-03-30 16:47 UTC (permalink / raw)
To: Andrew Rybchenko, dev; +Cc: stable
On 3/29/2017 9:28 AM, Andrew Rybchenko wrote:
> Fixes: 58294ee65afb ("net/sfc: support event queue")
> Cc: stable@dpdk.org
>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-30 16:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-29 8:28 [dpdk-stable] [PATCH] net/sfc: fix leak if EvQ DMA space allocation fails Andrew Rybchenko
2017-03-30 16:47 ` Ferruh Yigit
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).