On 02-02-2023 12:13, Luca Vizzarro wrote:
The interface for fcntl expects the argument passed for the command F_ADD_SEALS to be of type int. The current code wrongly treats it as a long.
This commit changes the signature of all the related and helper functions so that they treat the argument as int instead of long.
Signed-off-by: Luca Vizzarro Luca.Vizzarro@arm.com
fs/fcntl.c | 2 +- include/linux/memfd.h | 4 ++-- mm/memfd.c | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/fcntl.c b/fs/fcntl.c index dc416037d9fc..f9b7dd020bc9 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -412,7 +412,7 @@ static long do_fcntl(int fd, unsigned int cmd, user_uintptr_t arg, break; case F_ADD_SEALS: case F_GET_SEALS:
err = memfd_fcntl(filp, cmd, arg);
err = memfd_fcntl(filp, cmd, argi);diff --git a/include/linux/memfd.h b/include/linux/memfd.h index 4f1600413f91..e7abf6fa4c52 100644 --- a/include/linux/memfd.h +++ b/include/linux/memfd.h @@ -5,9 +5,9 @@ #include <linux/file.h> #ifdef CONFIG_MEMFD_CREATE -extern long memfd_fcntl(struct file *file, unsigned int cmd, unsigned long arg); +extern long memfd_fcntl(struct file *file, unsigned int cmd, unsigned int arg); #else -static inline long memfd_fcntl(struct file *f, unsigned int c, unsigned long a) +static inline long memfd_fcntl(struct file *f, unsigned int c, unsigned int a) { return -EINVAL; } diff --git a/mm/memfd.c b/mm/memfd.c index 08f5f8304746..f97081ff9a0d 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -234,16 +234,12 @@ static int memfd_get_seals(struct file *file) return seals ? *seals : -EINVAL; } -long memfd_fcntl(struct file *file, unsigned int cmd, unsigned long arg) +long memfd_fcntl(struct file *file, unsigned int cmd, unsigned int arg)
Hi Luca,
I think this function suffers from the same issue as pipe_fcntl from Patch 3.
{ long error; switch (cmd) { case F_ADD_SEALS:
/* disallow upper 32bit */if (arg > UINT_MAX)return -EINVAL;
Mention this change in the commit message.
Otherwise, all good.
Thanks, Tudor
error = memfd_add_seals(file, arg); break;case F_GET_SEALS: