linux-kernel - Re: [PATCH v2 02/12] cachefiles: remove err_put_fd tag in cachefiles_ondemand_daemon

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Mon, 20 May 2024 12:15:33 +0800
From: Baokun Li <libaokun@...weicloud.com>
To: Gao Xiang <hsiangkao@...ux.alibaba.com>, netfs@...ts.linux.dev,
 dhowells@...hat.com, jlayton@...nel.org
Cc: jefflexu@...ux.alibaba.com, zhujia.zj@...edance.com,
 linux-erofs@...ts.ozlabs.org, linux-fsdevel@...r.kernel.org,
 linux-kernel@...r.kernel.org, yangerkun@...wei.com, houtao1@...wei.com,
 yukuai3@...wei.com, wozizhi@...wei.com, Baokun Li <libaokun1@...wei.com>,
 libaokun@...weicloud.com
Subject: Re: [PATCH v2 02/12] cachefiles: remove err_put_fd tag in
 cachefiles_ondemand_daemon_read()

On 2024/5/20 10:23, Gao Xiang wrote:
>
>
> On 2024/5/15 16:45, libaokun@...weicloud.com wrote:
>> From: Baokun Li <libaokun1@...wei.com>
>>
>> The err_put_fd tag is only used once, so remove it to make the code more
>
> The err_put_fd label ..
>
> Also the subject line needs to be updated too.  ("C goto label")
>
Sorry about that, and thank you very much for the correction!

I will correct "tag" to "label" in the next iteration.

>> readable.
>>
>> Signed-off-by: Baokun Li <libaokun1@...wei.com>
>> Reviewed-by: Jia Zhu <zhujia.zj@...edance.com>
>
> Reviewed-by: Gao Xiang <hsiangkao@...ux.alibaba.com>
>
> Thanks,
> Gao Xiang
Thank you very much for your review!

Regards,
Baokun
>
>> ---
>>   fs/cachefiles/ondemand.c | 7 +++----
>>   1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
>> index 4ba42f1fa3b4..fd49728d8bae 100644
>> --- a/fs/cachefiles/ondemand.c
>> +++ b/fs/cachefiles/ondemand.c
>> @@ -347,7 +347,9 @@ ssize_t cachefiles_ondemand_daemon_read(struct 
>> cachefiles_cache *cache,
>>         if (copy_to_user(_buffer, msg, n) != 0) {
>>           ret = -EFAULT;
>> -        goto err_put_fd;
>> +        if (msg->opcode == CACHEFILES_OP_OPEN)
>> +            close_fd(((struct cachefiles_open *)msg->data)->fd);
>> +        goto error;
>>       }
>>         /* CLOSE request has no reply */
>> @@ -358,9 +360,6 @@ ssize_t cachefiles_ondemand_daemon_read(struct 
>> cachefiles_cache *cache,
>>         return n;
>>   -err_put_fd:
>> -    if (msg->opcode == CACHEFILES_OP_OPEN)
>> -        close_fd(((struct cachefiles_open *)msg->data)->fd);
>>   error:
>>       xa_erase(&cache->reqs, id);
>>       req->error = ret;

-- 
With Best Regards,
Baokun Li