All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: erofs: fix error handling in __erofs_get_meta_page
@ 2018-08-20 13:29 Gao Xiang
  2018-08-20 14:59 ` Chao Yu
  0 siblings, 1 reply; 4+ messages in thread
From: Gao Xiang @ 2018-08-20 13:29 UTC (permalink / raw)


As Dan reported in LKP's mailing list:

https://lists.01.org/pipermail/kbuild-all/2018-August/051419.html

New smatch warnings:
drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
drivers/staging/erofs/data.c:78 __erofs_get_meta_page() error: 'bio' dereferencing possible ERR_PTR()
drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?

Old smatch warnings:
drivers/staging/erofs/unzip_vle.c:989 z_erofs_vle_unzip() error: double unlock 'mutex:&z_pagemap_global_lock'
drivers/staging/erofs/unzip_vle.c:1318 z_erofs_vle_normalaccess_readpage() warn: should 'page->index << 12' be a 64 bit type?
drivers/staging/erofs/unzip_vle.c:1351 __z_erofs_vle_normalaccess_readpages() warn: should '()->index << 12' be a 64 bit type?

Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com>
---
Hi Chao,

Could you please fold this patch in the previous patch if it is convenient?
`staging: erofs: separate erofs_get_meta_page'

It seems v2 of these patches has not been sent out to the staging mailing list.
LINK: https://lore.kernel.org/lkml/ffd2748a-273f-792b-d418-2fcf85c3d45f at huawei.com/

Thanks,
Gao Xiang

 drivers/staging/erofs/data.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index 87a18a0..3c0d915 100644
--- a/drivers/staging/erofs/data.c
+++ b/drivers/staging/erofs/data.c
@@ -63,9 +63,9 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
 		struct bio *bio;
 
 		bio = erofs_grab_bio(sb, blkaddr, 1, read_endio, nofail);
-		if (unlikely(bio == NULL)) {
+		if (IS_ERR(bio)) {
 			DBG_BUGON(nofail);
-			err = -ENOMEM;
+			err = PTR_ERR(bio);
 			goto err_out;
 		}
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] staging: erofs: fix error handling in __erofs_get_meta_page
  2018-08-20 13:29 [PATCH] staging: erofs: fix error handling in __erofs_get_meta_page Gao Xiang
@ 2018-08-20 14:59 ` Chao Yu
  2018-08-20 15:36   ` Gao Xiang
  0 siblings, 1 reply; 4+ messages in thread
From: Chao Yu @ 2018-08-20 14:59 UTC (permalink / raw)


On 2018/8/20 21:29, Gao Xiang wrote:
> As Dan reported in LKP's mailing list:
> 
> https://lists.01.org/pipermail/kbuild-all/2018-August/051419.html
> 
> New smatch warnings:
> drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
> drivers/staging/erofs/data.c:78 __erofs_get_meta_page() error: 'bio' dereferencing possible ERR_PTR()
> drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
> 
> Old smatch warnings:
> drivers/staging/erofs/unzip_vle.c:989 z_erofs_vle_unzip() error: double unlock 'mutex:&z_pagemap_global_lock'
> drivers/staging/erofs/unzip_vle.c:1318 z_erofs_vle_normalaccess_readpage() warn: should 'page->index << 12' be a 64 bit type?
> drivers/staging/erofs/unzip_vle.c:1351 __z_erofs_vle_normalaccess_readpages() warn: should '()->index << 12' be a 64 bit type?
> 
> Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com>
> ---
> Hi Chao,
> 
> Could you please fold this patch in the previous patch if it is convenient?
> `staging: erofs: separate erofs_get_meta_page'
> 
> It seems v2 of these patches has not been sent out to the staging mailing list.
> LINK: https://lore.kernel.org/lkml/ffd2748a-273f-792b-d418-2fcf85c3d45f at huawei.com/

Hi Xiang,

Let me merge this into previous buggy one. :)

Thanks,

> 
> Thanks,
> Gao Xiang
> 
>  drivers/staging/erofs/data.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
> index 87a18a0..3c0d915 100644
> --- a/drivers/staging/erofs/data.c
> +++ b/drivers/staging/erofs/data.c
> @@ -63,9 +63,9 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
>  		struct bio *bio;
>  
>  		bio = erofs_grab_bio(sb, blkaddr, 1, read_endio, nofail);
> -		if (unlikely(bio == NULL)) {
> +		if (IS_ERR(bio)) {
>  			DBG_BUGON(nofail);
> -			err = -ENOMEM;
> +			err = PTR_ERR(bio);
>  			goto err_out;
>  		}
>  
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH] staging: erofs: fix error handling in __erofs_get_meta_page
  2018-08-20 14:59 ` Chao Yu
@ 2018-08-20 15:36   ` Gao Xiang
  2018-08-20 15:45     ` Chao Yu
  0 siblings, 1 reply; 4+ messages in thread
From: Gao Xiang @ 2018-08-20 15:36 UTC (permalink / raw)


Hi Chao,

On 2018/8/20 22:59, Chao Yu wrote:
> On 2018/8/20 21:29, Gao Xiang wrote:
>> As Dan reported in LKP's mailing list:
>>
>> https://lists.01.org/pipermail/kbuild-all/2018-August/051419.html
>>
>> New smatch warnings:
>> drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
>> drivers/staging/erofs/data.c:78 __erofs_get_meta_page() error: 'bio' dereferencing possible ERR_PTR()
>> drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
>>
>> Old smatch warnings:
>> drivers/staging/erofs/unzip_vle.c:989 z_erofs_vle_unzip() error: double unlock 'mutex:&z_pagemap_global_lock'
>> drivers/staging/erofs/unzip_vle.c:1318 z_erofs_vle_normalaccess_readpage() warn: should 'page->index << 12' be a 64 bit type?
>> drivers/staging/erofs/unzip_vle.c:1351 __z_erofs_vle_normalaccess_readpages() warn: should '()->index << 12' be a 64 bit type?
>>
>> Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com>
>> ---
>> Hi Chao,
>>
>> Could you please fold this patch in the previous patch if it is convenient?
>> `staging: erofs: separate erofs_get_meta_page'
>>
>> It seems v2 of these patches has not been sent out to the staging mailing list.
>> LINK: https://lore.kernel.org/lkml/ffd2748a-273f-792b-d418-2fcf85c3d45f at huawei.com/
> Hi Xiang,
> 
> Let me merge this into previous buggy one. :)
> 
> Thanks,
> 

Thanks for your quick patching :)

one more picky...
LINK:
https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/tree/drivers/staging/erofs/data.c?h=erofs&id=418b414392c2b6e588670a672489dfd015d80bc1#n66

if (unlikely(IS_ERR(bio))) {  ===>  if (IS_ERR(bio)) {

since

#define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned
long)-MAX_ERRNO)

static inline bool __must_check IS_ERR(__force const void *ptr)
{
	return IS_ERR_VALUE((unsigned long)ptr);
}

Thanks,
Gao Xiang

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH] staging: erofs: fix error handling in __erofs_get_meta_page
  2018-08-20 15:36   ` Gao Xiang
@ 2018-08-20 15:45     ` Chao Yu
  0 siblings, 0 replies; 4+ messages in thread
From: Chao Yu @ 2018-08-20 15:45 UTC (permalink / raw)


On 2018/8/20 23:36, Gao Xiang wrote:
> Hi Chao,
> 
> On 2018/8/20 22:59, Chao Yu wrote:
>> On 2018/8/20 21:29, Gao Xiang wrote:
>>> As Dan reported in LKP's mailing list:
>>>
>>> https://lists.01.org/pipermail/kbuild-all/2018-August/051419.html
>>>
>>> New smatch warnings:
>>> drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
>>> drivers/staging/erofs/data.c:78 __erofs_get_meta_page() error: 'bio' dereferencing possible ERR_PTR()
>>> drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
>>>
>>> Old smatch warnings:
>>> drivers/staging/erofs/unzip_vle.c:989 z_erofs_vle_unzip() error: double unlock 'mutex:&z_pagemap_global_lock'
>>> drivers/staging/erofs/unzip_vle.c:1318 z_erofs_vle_normalaccess_readpage() warn: should 'page->index << 12' be a 64 bit type?
>>> drivers/staging/erofs/unzip_vle.c:1351 __z_erofs_vle_normalaccess_readpages() warn: should '()->index << 12' be a 64 bit type?
>>>
>>> Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com>
>>> ---
>>> Hi Chao,
>>>
>>> Could you please fold this patch in the previous patch if it is convenient?
>>> `staging: erofs: separate erofs_get_meta_page'
>>>
>>> It seems v2 of these patches has not been sent out to the staging mailing list.
>>> LINK: https://lore.kernel.org/lkml/ffd2748a-273f-792b-d418-2fcf85c3d45f at huawei.com/
>> Hi Xiang,
>>
>> Let me merge this into previous buggy one. :)
>>
>> Thanks,
>>
> 
> Thanks for your quick patching :)
> 
> one more picky...
> LINK:
> https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/tree/drivers/staging/erofs/data.c?h=erofs&id=418b414392c2b6e588670a672489dfd015d80bc1#n66
> 
> if (unlikely(IS_ERR(bio))) {  ===>  if (IS_ERR(bio)) {

Alright, let me update it. I missed this due to manually merging by myself, it
looks that git-am your entire eml-format patch will be better. :)

Thanks,

> 
> since
> 
> #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned
> long)-MAX_ERRNO)
> 
> static inline bool __must_check IS_ERR(__force const void *ptr)
> {
> 	return IS_ERR_VALUE((unsigned long)ptr);
> }
> 
> Thanks,
> Gao Xiang
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-20 15:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-20 13:29 [PATCH] staging: erofs: fix error handling in __erofs_get_meta_page Gao Xiang
2018-08-20 14:59 ` Chao Yu
2018-08-20 15:36   ` Gao Xiang
2018-08-20 15:45     ` Chao Yu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.