2022-08-18 11:23:34

by Sun Ke

Subject: [v2] cachefiles: fix error return code in cachefiles_ondemand_copen()

If size < 0; open request will fail, but cachefiles_ondemand_copen return 0.
Fix to return a negative error code.

Fixes: c8383054506c ("cachefiles: notify the user daemon when looking up cookie")
Signed-off-by: Sun Ke <[email protected]>
---
fs/cachefiles/ondemand.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
index 1fee702d5529..ea8a1e8317d9 100644
--- a/fs/cachefiles/ondemand.c
+++ b/fs/cachefiles/ondemand.c
@@ -159,7 +159,7 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)
/* fail OPEN request if daemon reports an error */
if (size < 0) {
if (!IS_ERR_VALUE(size))
- size = -EINVAL;
+ ret = size = -EINVAL;
req->error = size;
goto out;
}
--
2.31.1

2022-08-18 11:38:56

by Sun Ke

Subject: Re: [v2] cachefiles: fix error return code in cachefiles_ondemand_copen()

在 2022/8/18 19:14, JeffleXu 写道:
>
>
> On 8/18/22 7:19 PM, Sun Ke wrote:
>> If size < 0; open request will fail, but cachefiles_ondemand_copen return 0.
>> Fix to return a negative error code.
>
> Could you please also update the commit log?

The cache_size field of copen is specified by the user daemon. If
cache_size < 0, then the OPEN request is expected to fail, while copen
itself shall succeed. However, return 0 is indeed unexpected when
cache_size is an invalid error code.
Fix to return a negative error code.

right?
>
> Otherwise LGTM.
>
> Reviewed-by: Jingbo Xu <[email protected]>
>
>
> BTW, also cc [email protected]
>
>>
>> Fixes: c8383054506c ("cachefiles: notify the user daemon when looking up cookie")
>> Signed-off-by: Sun Ke <[email protected]>
>> ---
>> fs/cachefiles/ondemand.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
>> index 1fee702d5529..ea8a1e8317d9 100644
>> --- a/fs/cachefiles/ondemand.c
>> +++ b/fs/cachefiles/ondemand.c
>> @@ -159,7 +159,7 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)
>> /* fail OPEN request if daemon reports an error */
>> if (size < 0) {
>> if (!IS_ERR_VALUE(size))
>> - size = -EINVAL;
>> + ret = size = -EINVAL;
>> req->error = size;
>> goto out;
>> }
>

2022-08-18 11:55:11

by Jingbo Xu

Subject: Re: [v2] cachefiles: fix error return code in cachefiles_ondemand_copen()

On 8/18/22 7:19 PM, Sun Ke wrote:
> If size < 0; open request will fail, but cachefiles_ondemand_copen return 0.
> Fix to return a negative error code.

Could you please also update the commit log?

Otherwise LGTM.

Reviewed-by: Jingbo Xu <[email protected]>


BTW, also cc [email protected]

>
> Fixes: c8383054506c ("cachefiles: notify the user daemon when looking up cookie")
> Signed-off-by: Sun Ke <[email protected]>
> ---
> fs/cachefiles/ondemand.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
> index 1fee702d5529..ea8a1e8317d9 100644
> --- a/fs/cachefiles/ondemand.c
> +++ b/fs/cachefiles/ondemand.c
> @@ -159,7 +159,7 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)
> /* fail OPEN request if daemon reports an error */
> if (size < 0) {
> if (!IS_ERR_VALUE(size))
> - size = -EINVAL;
> + ret = size = -EINVAL;
> req->error = size;
> goto out;
> }

--
Thanks,
Jingbo

2022-08-18 12:58:30

by Jingbo Xu

Subject: Re: [v2] cachefiles: fix error return code in cachefiles_ondemand_copen()

On 8/18/22 7:27 PM, Sun Ke wrote:
>
>
> 在 2022/8/18 19:14, JeffleXu 写道:
>>
>>
>> On 8/18/22 7:19 PM, Sun Ke wrote:
>>> If size < 0; open request will fail, but cachefiles_ondemand_copen
>>> return 0.
>>> Fix to return a negative error code.
>>
>> Could you please also update the commit log?
>
> The cache_size field of copen is specified by the user daemon. If
> cache_size < 0, then the OPEN request is expected to fail, while copen
> itself shall succeed. However, return 0 is indeed unexpected when
^
returning

> cache_size is an invalid error code.

> Fix to return a negative error code.

Fix this by returning error when cache_size is an invalid error code.


>>
>> Otherwise LGTM.
>>
>> Reviewed-by: Jingbo Xu <[email protected]>
>>
>>
>> BTW, also cc [email protected]
>>
>>>
>>> Fixes: c8383054506c ("cachefiles: notify the user daemon when looking
>>> up cookie")
>>> Signed-off-by: Sun Ke <[email protected]>
>>> ---
>>>   fs/cachefiles/ondemand.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
>>> index 1fee702d5529..ea8a1e8317d9 100644
>>> --- a/fs/cachefiles/ondemand.c
>>> +++ b/fs/cachefiles/ondemand.c
>>> @@ -159,7 +159,7 @@ int cachefiles_ondemand_copen(struct
>>> cachefiles_cache *cache, char *args)
>>>       /* fail OPEN request if daemon reports an error */
>>>       if (size < 0) {
>>>           if (!IS_ERR_VALUE(size))
>>> -            size = -EINVAL;
>>> +            ret = size = -EINVAL;
>>>           req->error = size;
>>>           goto out;
>>>       }
>>

--
Thanks,
Jingbo