From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Kees Cook <keescook@chromium.org>,
"Eric W . Biederman" <ebiederm@xmission.com>,
Arnd Bergmann <arnd@arndb.de>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: [PATCH] alpha: remove osf_{readv,writev}
Date: Tue, 4 Oct 2022 15:53:01 +0200 [thread overview]
Message-ID: <20221004135301.1420873-1-Jason@zx2c4.com> (raw)
In-Reply-To: <CAHk-=wjwvBc3VQMNtUVUrMBVoMPSPu26OuatZ_+1gZ2m-PmmRA@mail.gmail.com>
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
next prev parent reply other threads:[~2022-10-04 13:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Jason A. Donenfeld [this message]
2022-10-04 14:02 ` [PATCH] alpha: remove osf_{readv,writev} 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
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=20221004135301.1420873-1-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=arnd@arndb.de \
--cc=ebiederm@xmission.com \
--cc=keescook@chromium.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox