public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] aarch64: morello: fix missing variadic argument in fcntl Date: Fri, 5 Aug 2022 19:32:53 +0000 (GMT) [thread overview] Message-ID: <20220805193253.18F893857B9A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ed90470cc02574d8a0f1aae6c38089b43cc6e5f6 commit ed90470cc02574d8a0f1aae6c38089b43cc6e5f6 Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Fri Jul 15 14:10:53 2022 +0100 aarch64: morello: fix missing variadic argument in fcntl In fcntl va_arg is currently used even if the caller did not pass any variadic arguments. This is undefined behaviour and does not work with the Morello purecap ABI, so use a helper macro. When the argument is missing, the result of the helper macro is arbitrary as it will be ignored by the kernel, we just have to ensure it does not cause a runtime crash. Diff: --- sysdeps/unix/sysv/linux/aarch64/morello/sysdep.h | 2 ++ sysdeps/unix/sysv/linux/fcntl64.c | 6 +++++- sysdeps/unix/sysv/linux/fcntl_nocancel.c | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/morello/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/morello/sysdep.h index 5db89b096d..bad64a0674 100644 --- a/sysdeps/unix/sysv/linux/aarch64/morello/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/morello/sysdep.h @@ -105,6 +105,8 @@ typedef __intcap_t __sysarg_t; LOAD_ARGS_6 (c0, c1, c2, c3, c4, c5) \ register __sysarg_t _x6 asm ("c6") = _x6tmp; +# define FCNTL_VA_ARG(a, t) (a ? va_arg(a, t) : 0) + #endif /* __ASSEMBLER__ */ /* Disable pointer mangling for purecap ABI. */ diff --git a/sysdeps/unix/sysv/linux/fcntl64.c b/sysdeps/unix/sysv/linux/fcntl64.c index 5192b2d672..0b6afd3b59 100644 --- a/sysdeps/unix/sysv/linux/fcntl64.c +++ b/sysdeps/unix/sysv/linux/fcntl64.c @@ -29,6 +29,10 @@ # define __NR_fcntl64 __NR_fcntl #endif +#ifndef FCNTL_VA_ARG +# define FCNTL_VA_ARG(a, t) va_arg(a, t) +#endif + #ifndef FCNTL_ADJUST_CMD # define FCNTL_ADJUST_CMD(__cmd) __cmd #endif @@ -40,7 +44,7 @@ __libc_fcntl64 (int fd, int cmd, ...) void *arg; va_start (ap, cmd); - arg = va_arg (ap, void *); + arg = FCNTL_VA_ARG (ap, void *); va_end (ap); cmd = FCNTL_ADJUST_CMD (cmd); diff --git a/sysdeps/unix/sysv/linux/fcntl_nocancel.c b/sysdeps/unix/sysv/linux/fcntl_nocancel.c index 7c38e22399..f21b56d95b 100644 --- a/sysdeps/unix/sysv/linux/fcntl_nocancel.c +++ b/sysdeps/unix/sysv/linux/fcntl_nocancel.c @@ -26,6 +26,10 @@ # define __NR_fcntl64 __NR_fcntl #endif +#ifndef FCNTL_VA_ARG +# define FCNTL_VA_ARG(a, t) va_arg(a, t) +#endif + #ifndef FCNTL_ADJUST_CMD # define FCNTL_ADJUST_CMD(__cmd) __cmd #endif @@ -37,7 +41,7 @@ __fcntl64_nocancel (int fd, int cmd, ...) void *arg; va_start (ap, cmd); - arg = va_arg (ap, void *); + arg = FCNTL_VA_ARG (ap, void *); va_end (ap); cmd = FCNTL_ADJUST_CMD (cmd);
next reply other threads:[~2022-08-05 19:32 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-05 19:32 Szabolcs Nagy [this message] 2022-10-26 15:14 Szabolcs Nagy 2022-10-27 13:53 Szabolcs Nagy 2022-11-23 14:43 Szabolcs Nagy
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=20220805193253.18F893857B9A@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@sourceware.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: linkBe 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; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).