From: Zheng Qixing <zhengqixing@huaweicloud.com>
To: Damien Le Moal <dlemoal@kernel.org>, cassel@kernel.org
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
yukuai3@huawei.com, yi.zhang@huawei.com, yangerkun@huawei.com
Subject: Re: [PATCH v2] ata: libata: Fix memory leak for error path in ata_host_alloc()
Date: Tue, 27 Aug 2024 09:46:58 +0800 [thread overview]
Message-ID: <96b9bedb-891e-4db3-abfe-bf6ff18c6048@huaweicloud.com> (raw)
In-Reply-To: <ab0b512c-2d02-4eec-876c-2340284583fe@kernel.org>
在 2024/8/26 12:02, Damien Le Moal 写道:
> On 8/26/24 11:49 AM, Zheng Qixing wrote:
>> 在 2024/8/23 9:10, Damien Le Moal 写道:
>>> On 8/22/24 12:30 PM, Zheng Qixing wrote:
>>>> From: Zheng Qixing <zhengqixing@huawei.com>
>>>>
>>>> In ata_host_alloc(), if ata_port_alloc(host) fails to allocate memory
>>>> for a port, the allocated 'host' structure is not freed before returning
>>>> from the function. This results in a potential memory leak.
>>>>
>>>> This patch adds a kfree(host) before the error handling code is executed
>>>> to ensure that the 'host' structure is properly freed in case of an
>>>> allocation failure.
>>>>
>>>> Signed-off-by: Zheng Qixing <zhengqixing@huawei.com>
>>> This needs a Fixes tag. So I added:
>>>
>>> Fixes: 2623c7a5f279 ("libata: add refcounting to ata_host")
>>> Cc: stable@vger.kernel.org>
>>>
>>> and applied to for-6.11-fixes. Thanks.
>>
>> Based on Niklas Cassel's suggestion, the commit message and the actual
>> content of the patch do not match.
>>
>> It should state "if devres_alloc(ata_devres_release, 0, GFP_KERNEL)
>> fails to allocate memory" instead of "if ata_port_alloc(host) fails to allocate
>> memory for a port".
>>
>> Should I modify the commit message and submit a new version of the patch?
> No need. I fixed it up. The commit message now is:
>
> ata: libata: Fix memory leak for error path in ata_host_alloc()
>
> In ata_host_alloc(), if devres_alloc() fails to allocate the device host
> resource data pointer, the already allocated ata_host structure is not
> freed before returning from the function. This results in a potential
> memory leak.
>
> Call kfree(host) before jumping to the error handling path to ensure
> that the ata_host structure is properly freed if devres_alloc() fails.
Thanks. :)
Zheng Qixing
>
>>
>> Zheng Qixing
>>
>>
>>>> ---
>>>> Changes in v2:
>>>> - error path is wrong in v1
>>>>
>>>> drivers/ata/libata-core.c | 4 +++-
>>>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
>>>> index e4023fc288ac..f27a18990c38 100644
>>>> --- a/drivers/ata/libata-core.c
>>>> +++ b/drivers/ata/libata-core.c
>>>> @@ -5663,8 +5663,10 @@ struct ata_host *ata_host_alloc(struct device *dev,
>>>> int n_ports)
>>>> }
>>>> dr = devres_alloc(ata_devres_release, 0, GFP_KERNEL);
>>>> - if (!dr)
>>>> + if (!dr) {
>>>> + kfree(host);
>>>> goto err_out;
>>>> + }
>>>> devres_add(dev, dr);
>>>> dev_set_drvdata(dev, host);
>>
next prev parent reply other threads:[~2024-08-27 1:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-22 3:30 Zheng Qixing
2024-08-22 3:37 ` Yu Kuai
2024-08-23 1:10 ` Damien Le Moal
2024-08-26 2:49 ` Zheng Qixing
2024-08-26 4:02 ` Damien Le Moal
2024-08-27 1:46 ` Zheng Qixing [this message]
2024-08-23 10:12 ` Niklas Cassel
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=96b9bedb-891e-4db3-abfe-bf6ff18c6048@huaweicloud.com \
--to=zhengqixing@huaweicloud.com \
--cc=cassel@kernel.org \
--cc=dlemoal@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@huawei.com \
--cc=yukuai3@huawei.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
all inboxes | Powered by JetHome®