From: Yongseok Koh <yskoh@mellanox.com>
To: Ajit Khaparde <ajit.khaparde@broadcom.com>
Cc: Somnath Kotur <somnath.kotur@broadcom.com>,
Ray Jui <ray.jui@broadcom.com>,
Michael Wildt <michael.wildt@broadcom.com>,
Randy Schacher <stuart.schacher@broadcom.com>,
dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/bnxt: fix memory leaks in NVM commands' has been queued to LTS release 17.11.4
Date: Mon, 13 Aug 2018 13:40:03 -0700 [thread overview]
Message-ID: <20180813204010.25281-3-yskoh@mellanox.com> (raw)
In-Reply-To: <20180813204010.25281-1-yskoh@mellanox.com>
Hi,
FYI, your patch has been queued to LTS release 17.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/15/18. So please
shout if anyone has objections.
Thanks.
Yongseok
---
>From 6421d9662b12d3a9226b33a9ea3cf8f762771618 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Wed, 25 Jul 2018 18:15:45 -0700
Subject: [PATCH] net/bnxt: fix memory leaks in NVM commands
[ upstream commit 6621ae146166adaba8dc4c120ad8c0fabab95830 ]
In some cases we may not be freeing up memory allocated for certain
NVM commands because the code might have bailed out before reaching
rte_free(). This patch moves some code around to ensure the allocated
memory is freed before exiting the function.
Fixes: 19e6af01bb36 ("net/bnxt: support get/set EEPROM")
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Reviewed-by: Michael Wildt <michael.wildt@broadcom.com>
Reviewed-by: Randy Schacher <stuart.schacher@broadcom.com>
---
drivers/net/bnxt/bnxt_hwrm.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 9aa39e190..ce66dc53e 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -3106,13 +3106,12 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data)
req.host_dest_addr = rte_cpu_to_le_64(dma_handle);
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
- HWRM_CHECK_RESULT();
- HWRM_UNLOCK();
-
if (rc == 0)
memcpy(data, buf, len > buflen ? buflen : len);
rte_free(buf);
+ HWRM_CHECK_RESULT();
+ HWRM_UNLOCK();
return rc;
}
@@ -3144,12 +3143,13 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index,
req.offset = rte_cpu_to_le_32(offset);
req.len = rte_cpu_to_le_32(length);
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
- HWRM_CHECK_RESULT();
- HWRM_UNLOCK();
if (rc == 0)
memcpy(data, buf, length);
rte_free(buf);
+ HWRM_CHECK_RESULT();
+ HWRM_UNLOCK();
+
return rc;
}
@@ -3204,10 +3204,10 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
+ rte_free(buf);
HWRM_CHECK_RESULT();
HWRM_UNLOCK();
- rte_free(buf);
return rc;
}
--
2.11.0
next prev parent reply other threads:[~2018-08-13 20:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 20:40 [dpdk-stable] patch 'net/octeontx: fix stop clearing Rx/Tx functions' " Yongseok Koh
2018-08-13 20:40 ` [dpdk-stable] patch 'net/bnxt: fix filter freeing' " Yongseok Koh
2018-08-13 20:40 ` Yongseok Koh [this message]
2018-08-13 20:40 ` [dpdk-stable] patch 'net/bnxt: fix lock release on NVM write failure' " Yongseok Koh
2018-08-13 20:40 ` [dpdk-stable] patch 'net/bnxt: check access denied for HWRM commands' " Yongseok Koh
2018-08-13 20:40 ` [dpdk-stable] patch 'net/bnxt: fix RETA size' " Yongseok Koh
2018-08-13 20:40 ` [dpdk-stable] patch 'net/qede: fix interrupt handler unregister' " Yongseok Koh
2018-08-13 20:40 ` [dpdk-stable] patch 'net/qede/base: fix GRC attention callback' " Yongseok Koh
2018-08-13 20:40 ` [dpdk-stable] patch 'net/qede: fix MAC address removal failure message' " Yongseok Koh
2018-08-13 20:40 ` [dpdk-stable] patch 'net/bnx2x: fix FW command timeout during stop' " Yongseok Koh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180813204010.25281-3-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=ajit.khaparde@broadcom.com \
--cc=michael.wildt@broadcom.com \
--cc=ray.jui@broadcom.com \
--cc=somnath.kotur@broadcom.com \
--cc=stable@dpdk.org \
--cc=stuart.schacher@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).