From 41ac28c67272d99836aebb840e5ab94b3ae14023 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 26 Jan 2021 00:04:19 +0100 Subject: [PATCH] fs: fat: avoid out of bounds access warning When copying short name plus extension refer to the encapsulating structure and not to the short name element. Signed-off-by: Heinrich Schuchardt --- fs/fat/fat_write.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 0132ef9..aae3a6a 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -108,10 +108,7 @@ static int set_name(fat_itr *itr, const char *filename, char *shortname) char buf[13]; int i; int ret; - struct { - char name[8]; - char ext[3]; - } dirent; + struct nameext dirent; if (!filename) return -EIO; @@ -185,7 +182,7 @@ static int set_name(fat_itr *itr, const char *filename, char *shortname) } return -EIO; out: - memcpy(shortname, dirent.name, SHORT_NAME_SIZE); + memcpy(shortname, &dirent, SHORT_NAME_SIZE); return ret; } -- 2.7.4