fat: Use pointer to simple type in put_user()
PATCH v2 1/1 fat: Use pointer to simple type in put_user()
The put_user(val,ptr) macro wants a pointer to a simple type, but in fat_ioctl_filldir() the d_name field references an "array of chars". Be more accurate and explicitly give the pointer to the first character of the d_name[] array.
I noticed that issue while trying to optimize the parisc put_user() macro and used an intermediate variable to store the pointer. In that case I got this error:
In file included from include/linux/uaccess.h:11,
from include/linux/compat.h:17,
from fs/fat/dir.c:18:fs/fat/dir.c: In function ‘fat_ioctl_filldir’:fs/fat/dir.c:725:33: error: invalid initializer
725 | if (put_user(0, d2->d_name) || \
| ^~include/asm/uaccess.h:152:33: note: in definition of macro ‘__put_user’
152 | __typeof__(ptr) __ptr = ptr; \
| ^~~fs/fat/dir.c:759:1: note: in expansion of macro ‘FAT_IOCTL_FILLDIR_FUNC’
759 | FAT_IOCTL_FILLDIR_FUNC(fat_ioctl_filldir, __fat_dirent)
Andreas Schwab <[email protected]> suggested to use
__typeof__(&*(ptr)) __ptr = ptr;
instead. This works, but nevertheless it's probably reasonable to fix the original caller too.
__
v2: Adjusted the description with input from David Laight
<[email protected]> and Andreas Schwab <[email protected]>.
fs/fat/dir.c +1 -1
@@ -722,7 +722,7 @@ static int func(struct dir_context *ctx, const char *name, int name_len, \if (name_len >=sizeof (d1->d_name)) \ name_len =sizeof (d1->d_name) -1 ; \ \ - if (put_user(0, d2->d_name) || \ + if (put_user(0, &d2->d_name[0]) || \ put_user(0, &d2->d_reclen) || \ copy_to_user(d1->d_name, name, name_len) || \ put_user(0, d1->d_name + name_len) || \
Quoted 23 lines · Helge Deller
The
put_user(val,ptr)macro wants a pointer to a simple type, but infat_ioctl_filldir()thed_namefield references an "array of chars". Be more accurate and explicitly give the pointer to the first character of the d_name[] array.I noticed that issue while trying to optimize the parisc
put_user()macro and used an intermediate variable to store the pointer. In that case I got this error:In file included from
include/linux/uaccess.h:11,from include/linux/compat.h:17, from fs/fat/dir.c:18:
fs/fat/dir.c: In function ‘fat_ioctl_filldir’:fs/fat/dir.c:725:33: error: invalid initializer
725 | if (put_user(0, d2->d_name)|| \
| ^~include/asm/uaccess.h:152:33: note: in definition of macro ‘__put_user’
152 |__typeof__(ptr)__ptr= ptr; \
| ^~~fs/fat/dir.c:759:1: note: in expansion of macro ‘FAT_IOCTL_FILLDIR_FUNC’
759 |FAT_IOCTL_FILLDIR_FUNC(fat_ioctl_filldir, __fat_dirent)
Quoted 6 lines
Andreas Schwab <[email protected]> suggested to use
__typeof__(&*(ptr))__ptr= ptr;
instead. This works, but nevertheless it's probably reasonable to fix the original caller too.Signed-off-by Helge Deller <[email protected]>
Quoted 17 lines
__
v2: Adjusted the description with input from David Laight
<[email protected]> and Andreas Schwab <[email protected]>.fs/fat/dir.c +1
-1@@ -722,7 +722,7 @@ static int func(struct dir_context *ctx, const char *name, int name_len, \if (name_len >=sizeof (d1->d_name)) \ name_len =sizeof (d1->d_name) -1 ; \ \ - if (put_user(0, d2->d_name) || \ + if (put_user(0, &d2->d_name[0]) || \ put_user(0, &d2->d_reclen) || \ copy_to_user(d1->d_name, name, name_len) || \ put_user(0, d1->d_name + name_len) || \
Signature · 1 line
OGAWA Hirofumi <[email protected]>