From 3aa30d3fce01b2d956f2afa5555c2a99d369e901 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 1 Jul 2024 16:38:08 +0200 Subject: [PATCH] 4.19-stable patches added patches: ftruncate-pass-a-signed-offset.patch --- .../ftruncate-pass-a-signed-offset.patch | 72 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 73 insertions(+) create mode 100644 queue-4.19/ftruncate-pass-a-signed-offset.patch diff --git a/queue-4.19/ftruncate-pass-a-signed-offset.patch b/queue-4.19/ftruncate-pass-a-signed-offset.patch new file mode 100644 index 00000000000..548295c2ea7 --- /dev/null +++ b/queue-4.19/ftruncate-pass-a-signed-offset.patch @@ -0,0 +1,72 @@ +From 4b8e88e563b5f666446d002ad0dc1e6e8e7102b0 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Wed, 19 Jun 2024 11:34:09 +0200 +Subject: ftruncate: pass a signed offset + +From: Arnd Bergmann + +commit 4b8e88e563b5f666446d002ad0dc1e6e8e7102b0 upstream. + +The old ftruncate() syscall, using the 32-bit off_t misses a sign +extension when called in compat mode on 64-bit architectures. As a +result, passing a negative length accidentally succeeds in truncating +to file size between 2GiB and 4GiB. + +Changing the type of the compat syscall to the signed compat_off_t +changes the behavior so it instead returns -EINVAL. + +The native entry point, the truncate() syscall and the corresponding +loff_t based variants are all correct already and do not suffer +from this mistake. + +Fixes: 3f6d078d4acc ("fix compat truncate/ftruncate") +Reviewed-by: Christian Brauner +Cc: stable@vger.kernel.org +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman +--- + fs/open.c | 4 ++-- + include/linux/compat.h | 2 +- + include/linux/syscalls.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +--- a/fs/open.c ++++ b/fs/open.c +@@ -199,13 +199,13 @@ out: + return error; + } + +-SYSCALL_DEFINE2(ftruncate, unsigned int, fd, unsigned long, length) ++SYSCALL_DEFINE2(ftruncate, unsigned int, fd, off_t, length) + { + return do_sys_ftruncate(fd, length, 1); + } + + #ifdef CONFIG_COMPAT +-COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_ulong_t, length) ++COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_off_t, length) + { + return do_sys_ftruncate(fd, length, 1); + } +--- a/include/linux/compat.h ++++ b/include/linux/compat.h +@@ -598,7 +598,7 @@ asmlinkage long compat_sys_fstatfs(unsig + asmlinkage long compat_sys_fstatfs64(unsigned int fd, compat_size_t sz, + struct compat_statfs64 __user *buf); + asmlinkage long compat_sys_truncate(const char __user *, compat_off_t); +-asmlinkage long compat_sys_ftruncate(unsigned int, compat_ulong_t); ++asmlinkage long compat_sys_ftruncate(unsigned int, compat_off_t); + /* No generic prototype for truncate64, ftruncate64, fallocate */ + asmlinkage long compat_sys_openat(int dfd, const char __user *filename, + int flags, umode_t mode); +--- a/include/linux/syscalls.h ++++ b/include/linux/syscalls.h +@@ -404,7 +404,7 @@ asmlinkage long sys_fstatfs(unsigned int + asmlinkage long sys_fstatfs64(unsigned int fd, size_t sz, + struct statfs64 __user *buf); + asmlinkage long sys_truncate(const char __user *path, long length); +-asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length); ++asmlinkage long sys_ftruncate(unsigned int fd, off_t length); + #if BITS_PER_LONG == 32 + asmlinkage long sys_truncate64(const char __user *path, loff_t length); + asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length); diff --git a/queue-4.19/series b/queue-4.19/series index ea593dab6d8..581d09ef15c 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -143,3 +143,4 @@ drm-nouveau-dispnv04-fix-null-pointer-dereference-in-nv17_tv_get_ld_modes.patch drm-nouveau-dispnv04-fix-null-pointer-dereference-in-nv17_tv_get_hd_modes.patch batman-adv-don-t-accept-tt-entries-for-out-of-spec-vids.patch ata-libata-core-fix-double-free-on-error.patch +ftruncate-pass-a-signed-offset.patch -- 2.47.3