* [GIT PULL] execve updates for v6.1-rc1
@ 2022-10-01 16:40 Kees Cook
2022-10-04 0:02 ` Linus Torvalds
2022-10-04 0:36 ` [GIT PULL] execve updates for v6.1-rc1 pr-tracker-bot
0 siblings, 2 replies; 6+ messages in thread
From: Kees Cook @ 2022-10-01 16:40 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Arnd Bergmann, Eric W. Biederman, Kees Cook, Lukas Bulwahn
Hi Linus,
Please pull these execve updates for v6.1-rc1. This removes a.out
support globally; it has been disabled for a while now.
Thanks!
-Kees
The following changes since commit 33a2d6bc3480f9f8ac8c8def29854f98cc8bfee2:
Revert "fs/exec: allow to unshare a time namespace on vfork+exec" (2022-09-13 10:38:43 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/execve-v6.1-rc1
for you to fetch changes up to 9f4beead610c83065cc0410bfe97ff51d8e9578d:
binfmt: remove taso from linux_binprm struct (2022-09-29 16:38:05 -0700)
----------------------------------------------------------------
execve updates for v6.1-rc1
- Remove a.out implementation globally (Eric W. Biederman)
- Remove unused linux_binprm::taso member (Lukas Bulwahn)
----------------------------------------------------------------
Eric W. Biederman (1):
a.out: Remove the a.out implementation
Lukas Bulwahn (1):
binfmt: remove taso from linux_binprm struct
MAINTAINERS | 1 -
arch/alpha/include/asm/a.out.h | 16 --
arch/alpha/kernel/Makefile | 4 -
arch/alpha/kernel/binfmt_loader.c | 46 -----
arch/alpha/kernel/osf_sys.c | 30 ---
arch/arm/configs/badge4_defconfig | 1 -
arch/arm/configs/corgi_defconfig | 1 -
arch/arm/configs/ezx_defconfig | 1 -
arch/arm/configs/footbridge_defconfig | 1 -
arch/arm/configs/hackkit_defconfig | 1 -
arch/arm/configs/iop32x_defconfig | 1 -
arch/arm/configs/jornada720_defconfig | 1 -
arch/arm/configs/lart_defconfig | 1 -
arch/arm/configs/neponset_defconfig | 1 -
arch/arm/configs/netwinder_defconfig | 1 -
arch/arm/configs/rpc_defconfig | 1 -
arch/arm/configs/spitz_defconfig | 1 -
fs/Kconfig.binfmt | 33 ----
fs/Makefile | 1 -
fs/binfmt_aout.c | 342 ----------------------------------
fs/exec.c | 3 +-
include/linux/a.out.h | 18 --
include/linux/binfmts.h | 3 -
23 files changed, 1 insertion(+), 508 deletions(-)
delete mode 100644 arch/alpha/include/asm/a.out.h
delete mode 100644 arch/alpha/kernel/binfmt_loader.c
delete mode 100644 fs/binfmt_aout.c
delete mode 100644 include/linux/a.out.h
--
Kees Cook
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] execve updates for v6.1-rc1
2022-10-01 16:40 [GIT PULL] execve updates for v6.1-rc1 Kees Cook
@ 2022-10-04 0:02 ` Linus Torvalds
2022-10-04 13:53 ` [PATCH] alpha: remove osf_{readv,writev} Jason A. Donenfeld
2022-10-04 0:36 ` [GIT PULL] execve updates for v6.1-rc1 pr-tracker-bot
1 sibling, 1 reply; 6+ messages in thread
From: Linus Torvalds @ 2022-10-04 0:02 UTC (permalink / raw)
To: Kees Cook
Cc: linux-kernel, Arnd Bergmann, Eric W. Biederman, Lukas Bulwahn, alpha
On Sat, Oct 1, 2022 at 9:40 AM Kees Cook <keescook@chromium.org> wrote:
>
> Please pull these execve updates for v6.1-rc1. This removes a.out
> support globally; it has been disabled for a while now.
Pulled.
And I think some of the alpha side could be cleaned up a bit further,
in that I think this ends up making the osf_readv/writev system calls
be the exact same as the standard readv/writev, since the legacy OSF/1
hackery is now gone with CONFIG_OSF4_COMPAT being a thing of the past.
But it's not a big deal - cc'ing linux-alpha just in case somebody
feels inspired.
Linus
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] execve updates for v6.1-rc1
2022-10-01 16:40 [GIT PULL] execve updates for v6.1-rc1 Kees Cook
2022-10-04 0:02 ` Linus Torvalds
@ 2022-10-04 0:36 ` pr-tracker-bot
1 sibling, 0 replies; 6+ messages in thread
From: pr-tracker-bot @ 2022-10-04 0:36 UTC (permalink / raw)
To: Kees Cook
Cc: Linus Torvalds, linux-kernel, Arnd Bergmann, Eric W. Biederman,
Kees Cook, Lukas Bulwahn
The pull request you sent on Sat, 1 Oct 2022 09:40:11 -0700:
> https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/execve-v6.1-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/12ed00ba01abf39e0869c02ccdde5e24a357466b
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] alpha: remove osf_{readv,writev}
2022-10-04 0:02 ` Linus Torvalds
@ 2022-10-04 13:53 ` Jason A. Donenfeld
2022-10-04 14:02 ` Lukas Bulwahn
0 siblings, 1 reply; 6+ messages in thread
From: Jason A. Donenfeld @ 2022-10-04 13:53 UTC (permalink / raw)
To: linux-alpha, linux-kernel
Cc: Jason A. Donenfeld, Linus Torvalds, Kees Cook,
Eric W . Biederman, Arnd Bergmann, Lukas Bulwahn
As of 987f20a9dcce ("a.out: Remove the a.out implementation"),
sys_osf_{readv,writev} is now the same as sys_{readv,writev}. So remove
the osf indirection, and point the syscall table directly at the generic
functions, as is done on other platforms.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
Only compiled and QEMU-booted with no userspace, but seems simple
enough?
arch/alpha/kernel/osf_sys.c | 12 ------------
arch/alpha/kernel/syscalls/syscall.tbl | 4 ++--
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index b3ad8c44c971..6c6c4337e201 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -1278,18 +1278,6 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
return addr;
}
-SYSCALL_DEFINE3(osf_readv, unsigned long, fd,
- const struct iovec __user *, vector, unsigned long, count)
-{
- return sys_readv(fd, vector, count);
-}
-
-SYSCALL_DEFINE3(osf_writev, unsigned long, fd,
- const struct iovec __user *, vector, unsigned long, count)
-{
- return sys_writev(fd, vector, count);
-}
-
SYSCALL_DEFINE2(osf_getpriority, int, which, int, who)
{
int prio = sys_getpriority(which, who);
diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
index 3515bc4f16a4..8ebacf37a8cf 100644
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@ -125,8 +125,8 @@
116 common osf_gettimeofday sys_osf_gettimeofday
117 common osf_getrusage sys_osf_getrusage
118 common getsockopt sys_getsockopt
-120 common readv sys_osf_readv
-121 common writev sys_osf_writev
+120 common readv sys_readv
+121 common writev sys_writev
122 common osf_settimeofday sys_osf_settimeofday
123 common fchown sys_fchown
124 common fchmod sys_fchmod
--
2.37.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] alpha: remove osf_{readv,writev}
2022-10-04 13:53 ` [PATCH] alpha: remove osf_{readv,writev} Jason A. Donenfeld
@ 2022-10-04 14:02 ` Lukas Bulwahn
2022-10-04 14:03 ` Jason A. Donenfeld
0 siblings, 1 reply; 6+ messages in thread
From: Lukas Bulwahn @ 2022-10-04 14:02 UTC (permalink / raw)
To: Jason A. Donenfeld
Cc: linux-alpha, linux-kernel, Linus Torvalds, Kees Cook,
Eric W . Biederman, Arnd Bergmann
On Tue, Oct 4, 2022 at 3:53 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
>
> As of 987f20a9dcce ("a.out: Remove the a.out implementation"),
> sys_osf_{readv,writev} is now the same as sys_{readv,writev}. So remove
> the osf indirection, and point the syscall table directly at the generic
> functions, as is done on other platforms.
>
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> ---
> Only compiled and QEMU-booted with no userspace, but seems simple
> enough?
>
This patch looks exactly the same as the patch I sent a few hours ago:
https://lore.kernel.org/lkml/20221004071302.11471-1-lukas.bulwahn@gmail.com/
My patch was completely untested; good that this one is at least
compile tested and went through basic boot tests.
Any of the two patches, the one above or this one, can be picked.
Reviewed-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Lukas
> arch/alpha/kernel/osf_sys.c | 12 ------------
> arch/alpha/kernel/syscalls/syscall.tbl | 4 ++--
> 2 files changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
> index b3ad8c44c971..6c6c4337e201 100644
> --- a/arch/alpha/kernel/osf_sys.c
> +++ b/arch/alpha/kernel/osf_sys.c
> @@ -1278,18 +1278,6 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
> return addr;
> }
>
> -SYSCALL_DEFINE3(osf_readv, unsigned long, fd,
> - const struct iovec __user *, vector, unsigned long, count)
> -{
> - return sys_readv(fd, vector, count);
> -}
> -
> -SYSCALL_DEFINE3(osf_writev, unsigned long, fd,
> - const struct iovec __user *, vector, unsigned long, count)
> -{
> - return sys_writev(fd, vector, count);
> -}
> -
> SYSCALL_DEFINE2(osf_getpriority, int, which, int, who)
> {
> int prio = sys_getpriority(which, who);
> diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
> index 3515bc4f16a4..8ebacf37a8cf 100644
> --- a/arch/alpha/kernel/syscalls/syscall.tbl
> +++ b/arch/alpha/kernel/syscalls/syscall.tbl
> @@ -125,8 +125,8 @@
> 116 common osf_gettimeofday sys_osf_gettimeofday
> 117 common osf_getrusage sys_osf_getrusage
> 118 common getsockopt sys_getsockopt
> -120 common readv sys_osf_readv
> -121 common writev sys_osf_writev
> +120 common readv sys_readv
> +121 common writev sys_writev
> 122 common osf_settimeofday sys_osf_settimeofday
> 123 common fchown sys_fchown
> 124 common fchmod sys_fchmod
> --
> 2.37.3
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] alpha: remove osf_{readv,writev}
2022-10-04 14:02 ` Lukas Bulwahn
@ 2022-10-04 14:03 ` Jason A. Donenfeld
0 siblings, 0 replies; 6+ messages in thread
From: Jason A. Donenfeld @ 2022-10-04 14:03 UTC (permalink / raw)
To: Lukas Bulwahn
Cc: linux-alpha, linux-kernel, Linus Torvalds, Kees Cook,
Eric W . Biederman, Arnd Bergmann
On Tue, Oct 4, 2022 at 4:02 PM Lukas Bulwahn <lukas.bulwahn@gmail.com> wrote:
>
> On Tue, Oct 4, 2022 at 3:53 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> >
> > As of 987f20a9dcce ("a.out: Remove the a.out implementation"),
> > sys_osf_{readv,writev} is now the same as sys_{readv,writev}. So remove
> > the osf indirection, and point the syscall table directly at the generic
> > functions, as is done on other platforms.
> >
> > Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> > Cc: Kees Cook <keescook@chromium.org>
> > Cc: Eric W. Biederman <ebiederm@xmission.com>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> > ---
> > Only compiled and QEMU-booted with no userspace, but seems simple
> > enough?
> >
>
> This patch looks exactly the same as the patch I sent a few hours ago:
Whoops, my bad for not searching first.
Jason
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-10-04 14:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-01 16:40 [GIT PULL] execve updates for v6.1-rc1 Kees Cook
2022-10-04 0:02 ` Linus Torvalds
2022-10-04 13:53 ` [PATCH] alpha: remove osf_{readv,writev} Jason A. Donenfeld
2022-10-04 14:02 ` Lukas Bulwahn
2022-10-04 14:03 ` Jason A. Donenfeld
2022-10-04 0:36 ` [GIT PULL] execve updates for v6.1-rc1 pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).