summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2026-05-15 22:44:46 +0200
committerAndrew Morton <akpm@linux-foundation.org>2026-07-05 16:22:14 -0700
commitfcb6c9ec932bcec5f112ca8fec110ec6b457abf7 (patch)
tree0e70386abea2efc42f9d8da21cd7c2c5673e3473
parent7aada911797232fc703525091626abdb847bef2e (diff)
downloadlinux-next-fcb6c9ec932bcec5f112ca8fec110ec6b457abf7.tar.gz
linux-next-fcb6c9ec932bcec5f112ca8fec110ec6b457abf7.zip
fat: avoid stack overflow warning
Building the fat kunit tests on with -fsanitize=alignment reveals some rather excessive stack usage: fs/fat/fat_test.c: In function 'fat_clus_to_blknr_test': fs/fat/fat_test.c:33:1: error: the frame size of 4736 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] 33 | } | ^ fs/fat/fat_test.c: In function 'fat_get_blknr_offset_test': fs/fat/fat_test.c:52:1: error: the frame size of 4800 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] The problem is clearly related to the on-stack copy of a local msdos_sb_info structure. Avoid this by making that copy 'static const' and changing the called functions to accept a constant input. Link: https://lore.kernel.org/20260515204456.2692208-1-arnd@kernel.org Fixes: 410002f8139c ("kunit: fat: test cluster and directory i_pos layout helpers") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Christian Brauner <brauner@kernel.org> Cc: Jan Kara <jack@suse.cz> Cc: Adi Nata <adinata.softwareengineer@gmail.com> Cc: David Laight <david.laight.linux@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--fs/fat/fat.h4
-rw-r--r--fs/fat/fat_test.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/fat/fat.h b/fs/fat/fat.h
index 99ed9228a677..2772675bd35a 100644
--- a/fs/fat/fat.h
+++ b/fs/fat/fat.h
@@ -249,13 +249,13 @@ static inline unsigned char fat_checksum(const __u8 *name)
return s;
}
-static inline sector_t fat_clus_to_blknr(struct msdos_sb_info *sbi, int clus)
+static inline sector_t fat_clus_to_blknr(const struct msdos_sb_info *sbi, int clus)
{
return ((sector_t)clus - FAT_START_ENT) * sbi->sec_per_clus
+ sbi->data_start;
}
-static inline void fat_get_blknr_offset(struct msdos_sb_info *sbi,
+static inline void fat_get_blknr_offset(const struct msdos_sb_info *sbi,
loff_t i_pos, sector_t *blknr, int *offset)
{
*blknr = i_pos >> sbi->dir_per_block_bits;
diff --git a/fs/fat/fat_test.c b/fs/fat/fat_test.c
index 4eeed9dca549..9583ce66dca3 100644
--- a/fs/fat/fat_test.c
+++ b/fs/fat/fat_test.c
@@ -22,7 +22,7 @@ static void fat_checksum_test(struct kunit *test)
static void fat_clus_to_blknr_test(struct kunit *test)
{
- struct msdos_sb_info sbi = {
+ static const struct msdos_sb_info sbi = {
.sec_per_clus = 4,
.data_start = 100,
};
@@ -34,7 +34,7 @@ static void fat_clus_to_blknr_test(struct kunit *test)
static void fat_get_blknr_offset_test(struct kunit *test)
{
- struct msdos_sb_info sbi = {
+ static const struct msdos_sb_info sbi = {
.dir_per_block = 16,
.dir_per_block_bits = 4,
};