]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libblkid: f2fs: tighten log_blocksize validation
authorKarel Zak <kzak@redhat.com>
Wed, 15 Apr 2026 15:16:07 +0000 (17:16 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 23 Apr 2026 12:07:45 +0000 (14:07 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
libblkid/src/superblocks/f2fs.c

index 4e0fdbfe30549d63b63b30570198f91ea53f0ec4..910c7daa196cb2b32cc1d6d67657785aa183a225 100644 (file)
@@ -109,7 +109,9 @@ static int probe_f2fs(blkid_probe pr, const struct blkid_idmag *mag)
 
        blkid_probe_set_uuid(pr, sb->uuid);
        blkid_probe_sprintf_version(pr, "%u.%u", vermaj, vermin);
-       if (le32_to_cpu(sb->log_blocksize) < 32){
+       /* kernel requires log_blocksize == PAGE_SHIFT (usually 12),
+        * values above 16 (64K) would overflow 1U << shift */
+       if (le32_to_cpu(sb->log_blocksize) <= 16){
                uint32_t blocksize = 1U << le32_to_cpu(sb->log_blocksize);
                blkid_probe_set_fsblocksize(pr, blocksize);
                blkid_probe_set_block_size(pr, blocksize);