From: Helge Deller <deller@gmx.de>
To: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-parisc@vger.kernel.org
Subject: [PATCH] fat: Use pointer to d_name[0] in put_user() for compat case
Date: Sun, 13 Feb 2022 23:10:27 +0100 [thread overview]
Message-ID: <YgmB01p+p45Cihhg@p100> (raw)
The put_user(val,ptr) macro wants a pointer in the second parameter, but in
fat_ioctl_filldir() the d_name field references a whole "array of chars".
Usually the compiler automatically converts it and uses a pointer to that
array, but it's more clean to explicitly give the real pointer to where someting
is put, which is in this case 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)
The patch below cleans it up.
Signed-off-by: Helge Deller <deller@gmx.de>
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index c4a274285858..249825017da7 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -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) || \
next reply other threads:[~2022-02-13 22:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-13 22:10 Helge Deller [this message]
2022-02-14 7:59 ` [PATCH] fat: Use pointer to d_name[0] in put_user() for compat case OGAWA Hirofumi
2022-02-14 9:12 ` David Laight
2022-02-14 9:26 ` David Laight
2022-02-14 11:05 ` Helge Deller
2022-02-14 11:11 ` David Laight
2022-02-14 9:27 ` Andreas Schwab
2022-02-14 10:13 ` Helge Deller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YgmB01p+p45Cihhg@p100 \
--to=deller@gmx.de \
--cc=akpm@linux-foundation.org \
--cc=hirofumi@mail.parknet.co.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.