patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Laatz <kevin.laatz@intel.com>
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: <dev@dpdk.org>, <stable@dpdk.org>, Conor Walsh <conor.walsh@intel.com>
Subject: Re: [PATCH 2/5] dma/idxd: fix memory leak due to free on incorrect pointer
Date: Tue, 19 Apr 2022 17:20:01 +0100	[thread overview]
Message-ID: <252628e0-a7d5-edf3-170b-0d35318b43b7@intel.com> (raw)
In-Reply-To: <YlBMMdAVmMgdo8jY@bricha3-MOBL.ger.corp.intel.com>

On 08/04/2022 15:52, Bruce Richardson wrote:
> On Fri, Apr 08, 2022 at 03:15:01PM +0100, Kevin Laatz wrote:
>> During PCI device close, any allocated memory needs to be free'd.
>> Currently, one of the free's is being called on an incorrect idxd_dmadev
>> struct member, namely 'batch_idx_ring', causing a memleak from the
>> pointer that should have been free'd.
>> This patch fixes this memleak by calling free on the correct pointer.
>>
>> Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe")
>> Cc: stable@dpdk.org
>> Cc: bruce.richardson@intel.com
>>
>> Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
>> ---
>>   drivers/dma/idxd/idxd_pci.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c
>> index 7036eb938d..fdb1f15750 100644
>> --- a/drivers/dma/idxd/idxd_pci.c
>> +++ b/drivers/dma/idxd/idxd_pci.c
>> @@ -130,7 +130,7 @@ idxd_pci_dev_close(struct rte_dma_dev *dev)
>>   
>>   	/* free device memory */
>>   	IDXD_PMD_DEBUG("Freeing device driver memory");
>> -	rte_free(idxd->batch_idx_ring);
>> +	rte_free(idxd->batch_comp_ring);
>>   	rte_free(idxd->desc_ring);
>>   
> This is largely my fault, I expect, for being "smart" and allocating the
> memory for both arrays from the one allocation. To clarify things, we need
> to:
> 1) update the commit log message explaining why it's the wrong pointer,
> i.e. that the two are in the one memory reservation
> 2) similarly add a comment to the rte_free call noting that it frees the
> idx_ring too.
>
> Alternatively, we can also consider adjusting the allocation code so both
> arrays are allocated separately, and on free are freed similarly. We would,
> however, need to double check that doing so introduces no perf hit.
>
I'll add explanations/comments where needed in v2, thanks for the feedback.

Kevin


  reply	other threads:[~2022-04-19 16:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20220408141504.1319913-1-kevin.laatz@intel.com>
2022-04-08 14:15 ` [PATCH 1/5] dma/idxd: fix memory leak in pci close Kevin Laatz
2022-04-08 14:49   ` Bruce Richardson
2022-04-08 14:15 ` [PATCH 2/5] dma/idxd: fix memory leak due to free on incorrect pointer Kevin Laatz
2022-04-08 14:52   ` Bruce Richardson
2022-04-19 16:20     ` Kevin Laatz [this message]
2022-04-08 14:15 ` [PATCH 5/5] examples/dma: fix missing dma close Kevin Laatz
     [not found] ` <20220703122243.929642-1-kevin.laatz@intel.com>
2022-07-03 12:22   ` [PATCH v2 1/3] dma/idxd: fix memory leak in pci close Kevin Laatz
2022-07-04 13:19     ` Bruce Richardson
2022-07-04 13:34       ` Kevin Laatz
2022-07-04 13:44         ` Bruce Richardson
2022-07-03 12:22   ` [PATCH v2 2/3] dma/idxd: fix memory leak due to free on incorrect pointer Kevin Laatz
2022-07-04 13:23     ` Bruce Richardson
2022-07-04 13:25       ` Bruce Richardson
2022-07-03 12:22   ` [PATCH v2 3/3] dma/idxd: fix null pointer dereference during pci remove Kevin Laatz
2022-07-04 13:25     ` Bruce Richardson
     [not found] ` <20220704152751.943965-1-kevin.laatz@intel.com>
2022-07-04 15:27   ` [PATCH v3 1/3] dma/idxd: fix memory leak in pci close Kevin Laatz
2022-07-04 15:39     ` Bruce Richardson
2022-07-04 15:27   ` [PATCH v3 2/3] dma/idxd: fix memory leak due to free on incorrect pointer Kevin Laatz
2022-07-04 15:27   ` [PATCH v3 3/3] dma/idxd: fix null pointer dereference during pci remove Kevin Laatz

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=252628e0-a7d5-edf3-170b-0d35318b43b7@intel.com \
    --to=kevin.laatz@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=conor.walsh@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /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).