]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
f2fs: prevent possible int overflow in dir_block_index()
authorNikita Zhandarovich <n.zhandarovich@fintech.ru>
Wed, 24 Jul 2024 17:05:44 +0000 (10:05 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Mon, 5 Aug 2024 20:18:35 +0000 (20:18 +0000)
The result of multiplication between values derived from functions
dir_buckets() and bucket_blocks() *could* technically reach
2^30 * 2^2 = 2^32.

While unlikely to happen, it is prudent to ensure that it will not
lead to integer overflow. Thus, use mul_u32_u32() as it's more
appropriate to mitigate the issue.

Found by Linux Verification Center (linuxtesting.org) with static
analysis tool SVACE.

Fixes: 3843154598a0 ("f2fs: introduce large directory support")
Cc: stable@vger.kernel.org
Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/dir.c

index cbd7a5e96a371e7a68aa10214104833e179627f0..14900ca8a9ffbd7028f252d25fcc02992a038994 100644 (file)
@@ -166,7 +166,8 @@ static unsigned long dir_block_index(unsigned int level,
        unsigned long bidx = 0;
 
        for (i = 0; i < level; i++)
-               bidx += dir_buckets(i, dir_level) * bucket_blocks(i);
+               bidx += mul_u32_u32(dir_buckets(i, dir_level),
+                                   bucket_blocks(i));
        bidx += idx * bucket_blocks(level);
        return bidx;
 }