1. Patchew
  2. linux
  3. View series

[PATCH] f2fs: fix null reference error when checking end of zone

Daejun Park posted 1 patch 1 year, 7 months ago 
fs/f2fs/data.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[PATCH] f2fs: fix null reference error when checking end of zone
Posted by Daejun Park 1 year, 7 months ago 
This patch fixes a potentially null pointer being accessed by
is_end_zone_blkaddr() that checks the last block of a zone
when f2fs is mounted as a single device.

Fixes: e067dc3c6b9c ("f2fs: maintain six open zones for zoned devices")
Signed-off-by: Daejun Park <daejun7.park@samsung.com>
---
 fs/f2fs/data.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b6dcb3bcaef7..1aa7eefa659c 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -925,6 +925,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
 #ifdef CONFIG_BLK_DEV_ZONED
 static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
 {
+	struct block_device *bdev = sbi->sb->s_bdev;
 	int devi = 0;
 
 	if (f2fs_is_multi_device(sbi)) {
@@ -935,8 +936,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
 			return false;
 		}
 		blkaddr -= FDEV(devi).start_blk;
+		bdev = FDEV(devi).bdev;
 	}
-	return bdev_is_zoned(FDEV(devi).bdev) &&
+	return bdev_is_zoned(bdev) &&
 		f2fs_blkz_is_seq(sbi, devi, blkaddr) &&
 		(blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);
 }
-- 
2.25.1
Re: [PATCH] f2fs: fix null reference error when checking end of zone
Posted by Chao Yu 1 year, 7 months ago 
On 2024/7/4 9:01, Daejun Park wrote:
> This patch fixes a potentially null pointer being accessed by
> is_end_zone_blkaddr() that checks the last block of a zone
> when f2fs is mounted as a single device.

blkzoned feature depends on multiple device feature? One regular
device and one seq-zone device?

Thanks,

> 
> Fixes: e067dc3c6b9c ("f2fs: maintain six open zones for zoned devices")
> Signed-off-by: Daejun Park <daejun7.park@samsung.com>
> ---
>   fs/f2fs/data.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index b6dcb3bcaef7..1aa7eefa659c 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -925,6 +925,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
>   #ifdef CONFIG_BLK_DEV_ZONED
>   static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
>   {
> +	struct block_device *bdev = sbi->sb->s_bdev;
>   	int devi = 0;
>   
>   	if (f2fs_is_multi_device(sbi)) {
> @@ -935,8 +936,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
>   			return false;
>   		}
>   		blkaddr -= FDEV(devi).start_blk;
> +		bdev = FDEV(devi).bdev;
>   	}
> -	return bdev_is_zoned(FDEV(devi).bdev) &&
> +	return bdev_is_zoned(bdev) &&
>   		f2fs_blkz_is_seq(sbi, devi, blkaddr) &&
>   		(blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);
>   }
Re: [f2fs-dev] [PATCH] f2fs: fix null reference error when checking end of zone
Posted by Daeho Jeong 1 year, 7 months ago 
On Thu, Jul 4, 2024 at 12:17 AM Chao Yu <chao@kernel.org> wrote:
>
> On 2024/7/4 9:01, Daejun Park wrote:
> > This patch fixes a potentially null pointer being accessed by
> > is_end_zone_blkaddr() that checks the last block of a zone
> > when f2fs is mounted as a single device.
>
> blkzoned feature depends on multiple device feature? One regular
> device and one seq-zone device?
>
> Thanks,
>
> >
> > Fixes: e067dc3c6b9c ("f2fs: maintain six open zones for zoned devices")
> > Signed-off-by: Daejun Park <daejun7.park@samsung.com>
> > ---
> >   fs/f2fs/data.c | 4 +++-
> >   1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> > index b6dcb3bcaef7..1aa7eefa659c 100644
> > --- a/fs/f2fs/data.c
> > +++ b/fs/f2fs/data.c
> > @@ -925,6 +925,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
> >   #ifdef CONFIG_BLK_DEV_ZONED
> >   static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
> >   {
> > +     struct block_device *bdev = sbi->sb->s_bdev;
> >       int devi = 0;
> >
> >       if (f2fs_is_multi_device(sbi)) {
> > @@ -935,8 +936,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
> >                       return false;
> >               }
> >               blkaddr -= FDEV(devi).start_blk;
> > +             bdev = FDEV(devi).bdev;
> >       }
> > -     return bdev_is_zoned(FDEV(devi).bdev) &&
> > +     return bdev_is_zoned(bdev) &&
> >               f2fs_blkz_is_seq(sbi, devi, blkaddr) &&
> >               (blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);
> >   }
>

Reviewed-by: Daeho Jeong <daehojeong@google.com>

Thanks,


>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
RE:(2) [PATCH] f2fs: fix null reference error when checking end of zone
Posted by Daejun Park 1 year, 7 months ago 
Hi Chao Yu,
> 
>--------- Original Message ---------
>Sender : Chao Yu <chao@kernel.org>
>Date : 2024-07-04 16:16 (GMT+9)
>Title : Re: [PATCH] f2fs: fix null reference error when checking end of zone
> 
>On 2024/7/4 9:01, Daejun Park wrote:
>> This patch fixes a potentially null pointer being accessed by
>> is_end_zone_blkaddr() that checks the last block of a zone
>> when f2fs is mounted as a single device.
>
>blkzoned feature depends on multiple device feature? One regular
>device and one seq-zone device?

According to mkfs.f2fs, if there are a sufficient number of
conventional zones, a single zoned device can be used.

Thanks,
Daejun

>
>Thanks,
>
>>
>> Fixes: e067dc3c6b9c ("f2fs: maintain six open zones for zoned devices")
>> Signed-off-by: Daejun Park <daejun7.park@samsung.com>
>> ---
>>  fs/f2fs/data.c 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
>> index b6dcb3bcaef7..1aa7eefa659c 100644
>> --- a/fs/f2fs/data.c
>> +++ b/fs/f2fs/data.c
>> @@ -925,6 +925,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
>>  #ifdef CONFIG_BLK_DEV_ZONED
>>  static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
>>  {
>> +        struct block_device *bdev = sbi->sb->s_bdev;
>>           int devi = 0;
>> 
>>           if (f2fs_is_multi_device(sbi)) {
>> @@ -935,8 +936,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
>>                           return false;
>>                   }
>>                   blkaddr -= FDEV(devi).start_blk;
>> +                bdev = FDEV(devi).bdev;
>>           }
>> -        return bdev_is_zoned(FDEV(devi).bdev) &&
>> +        return bdev_is_zoned(bdev) &&
>>                   f2fs_blkz_is_seq(sbi, devi, blkaddr) &&
>>                   (blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);
>>  }
Re: (2) [PATCH] f2fs: fix null reference error when checking end of zone
Posted by Chao Yu 1 year, 7 months ago 
On 2024/7/4 15:55, Daejun Park wrote:
> Hi Chao Yu,
>>   
>> --------- Original Message ---------
>> Sender : Chao Yu <chao@kernel.org>
>> Date : 2024-07-04 16:16 (GMT+9)
>> Title : Re: [PATCH] f2fs: fix null reference error when checking end of zone
>>   
>> On 2024/7/4 9:01, Daejun Park wrote:
>>> This patch fixes a potentially null pointer being accessed by
>>> is_end_zone_blkaddr() that checks the last block of a zone
>>> when f2fs is mounted as a single device.
>>
>> blkzoned feature depends on multiple device feature? One regular
>> device and one seq-zone device?
> 
> According to mkfs.f2fs, if there are a sufficient number of
> conventional zones, a single zoned device can be used.

Correct.

Anyway, the code looks clean.

Reviewed-by: Chao Yu <chao@kernel.org>

Thanks,

> 
> Thanks,
> Daejun
> 
>>
>> Thanks,
>>
>>>
>>> Fixes: e067dc3c6b9c ("f2fs: maintain six open zones for zoned devices")
>>> Signed-off-by: Daejun Park <daejun7.park@samsung.com>
>>> ---
>>>    fs/f2fs/data.c 4 +++-
>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
>>> index b6dcb3bcaef7..1aa7eefa659c 100644
>>> --- a/fs/f2fs/data.c
>>> +++ b/fs/f2fs/data.c
>>> @@ -925,6 +925,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
>>>    #ifdef CONFIG_BLK_DEV_ZONED
>>>    static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
>>>    {
>>> +        struct block_device *bdev = sbi->sb->s_bdev;
>>>             int devi = 0;
>>>   
>>>             if (f2fs_is_multi_device(sbi)) {
>>> @@ -935,8 +936,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
>>>                             return false;
>>>                     }
>>>                     blkaddr -= FDEV(devi).start_blk;
>>> +                bdev = FDEV(devi).bdev;
>>>             }
>>> -        return bdev_is_zoned(FDEV(devi).bdev) &&
>>> +        return bdev_is_zoned(bdev) &&
>>>                     f2fs_blkz_is_seq(sbi, devi, blkaddr) &&
>>>                     (blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);
>>>    }
Re: [PATCH] f2fs: fix null reference error when checking end of zone
Posted by Markus Elfring 1 year, 7 months ago 
> This patch fixes a potentially null pointer being accessed by
…

Please improve such a change description with imperative wordings.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.10-rc6#n94


How do you think about to use a summary phrase like
“Prevent null pointer dereference in is_end_zone_blkaddr()”?

Regards,
Markus

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.