Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sun, 13 Feb 2022 23:10:27 +0100
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
Message-ID: <YgmB01p+p45Cihhg@p100>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The put_user(val,ptr) macro wants a pointer in the second parameter, but i=
n
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 so=
meting
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 =E2=80=98fat_ioctl_filldir=E2=80=99:
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 =E2=80=98__put_=
user=E2=80=99
  152 |         __typeof__(ptr) __ptr =3D ptr;                            =
\
      |                                 ^~~
fs/fat/dir.c:759:1: note: in expansion of macro =E2=80=98FAT_IOCTL_FILLDIR=
_FUNC=E2=80=99
  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
=2D-- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -722,7 +722,7 @@ static int func(struct dir_context *ctx, const char *n=
ame, int name_len,   \
 		if (name_len >=3D sizeof(d1->d_name))			   \
 			name_len =3D 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)		||	   \