From: Vincenzo Frascino <vincenzo.frascino@arm.com> To: linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, linux-mips@vger.kernel.org, x86@kernel.org Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de>, Russell King <linux@armlinux.org.uk>, Paul Burton <paul.burton@mips.com>, Thomas Gleixner <tglx@linutronix.de>, Andy Lutomirski <luto@kernel.org>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Stephen Boyd <sboyd@kernel.org>, Mark Salyzyn <salyzyn@android.com>, Kees Cook <keescook@chromium.org>, Peter Collingbourne <pcc@google.com>, Dmitry Safonov <0x7f454c46@gmail.com>, Andrei Vagin <avagin@openvz.org>, Nick Desaulniers <ndesaulniers@google.com>, Marc Zyngier <maz@kernel.org>, Mark Rutland <Mark.Rutland@arm.com>, Will Deacon <will@kernel.org> Subject: [PATCH v4 18/26] arm64: vdso32: Replace TASK_SIZE_32 check in vgettimeofday Date: Tue, 17 Mar 2020 12:22:12 +0000 [thread overview] Message-ID: <20200317122220.30393-19-vincenzo.frascino@arm.com> (raw) In-Reply-To: <20200317122220.30393-1-vincenzo.frascino@arm.com> For ABI compatibility with arm32, the compat vDSO layer on arm64 needs to return -EINVAL when UINTPTR_MAX is passed as argument to the clock_get* functions. Replace TASK_SIZE_32 with a more semantically correct formula that checks for wrapping around 0. Note: This will allow to not define TASK_SIZE_32 for the vdso headers in a future patch that will introduce asm/vdso/processor.h on arm64. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- arch/arm64/kernel/vdso32/vgettimeofday.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/vdso32/vgettimeofday.c b/arch/arm64/kernel/vdso32/vgettimeofday.c index 54fc1c2ce93f..91138077b073 100644 --- a/arch/arm64/kernel/vdso32/vgettimeofday.c +++ b/arch/arm64/kernel/vdso32/vgettimeofday.c @@ -8,11 +8,14 @@ #include <linux/time.h> #include <linux/types.h> +#define VALID_CLOCK_ID(x) \ + ((x >= 0) && (x < VDSO_BASES)) + int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts) { /* The checks below are required for ABI consistency with arm */ - if ((u32)ts >= TASK_SIZE_32) + if ((u32)ts > UINTPTR_MAX - sizeof(*ts) + 1) return -EFAULT; return __cvdso_clock_gettime32(clock, ts); @@ -22,7 +25,7 @@ int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts) { /* The checks below are required for ABI consistency with arm */ - if ((u32)ts >= TASK_SIZE_32) + if ((u32)ts > UINTPTR_MAX - sizeof(*ts) + 1) return -EFAULT; return __cvdso_clock_gettime(clock, ts); @@ -38,9 +41,12 @@ int __vdso_clock_getres(clockid_t clock_id, struct old_timespec32 *res) { /* The checks below are required for ABI consistency with arm */ - if ((u32)res >= TASK_SIZE_32) + if ((u32)res > UINTPTR_MAX - sizeof(res) + 1) return -EFAULT; + if (!VALID_CLOCK_ID(clock_id) && res == NULL) + return -EINVAL; + return __cvdso_clock_getres_time32(clock_id, res); } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Vincenzo Frascino <vincenzo.frascino@arm.com> To: linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, linux-mips@vger.kernel.org, x86@kernel.org Cc: Mark Rutland <Mark.Rutland@arm.com>, Nick Desaulniers <ndesaulniers@google.com>, Dmitry Safonov <0x7f454c46@gmail.com>, Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>, Stephen Boyd <sboyd@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Russell King <linux@armlinux.org.uk>, Mark Salyzyn <salyzyn@android.com>, Paul Burton <paul.burton@mips.com>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Andy Lutomirski <luto@kernel.org>, Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Peter Collingbourne <pcc@google.com>, Andrei Vagin <avagin@openvz.org> Subject: [PATCH v4 18/26] arm64: vdso32: Replace TASK_SIZE_32 check in vgettimeofday Date: Tue, 17 Mar 2020 12:22:12 +0000 [thread overview] Message-ID: <20200317122220.30393-19-vincenzo.frascino@arm.com> (raw) In-Reply-To: <20200317122220.30393-1-vincenzo.frascino@arm.com> For ABI compatibility with arm32, the compat vDSO layer on arm64 needs to return -EINVAL when UINTPTR_MAX is passed as argument to the clock_get* functions. Replace TASK_SIZE_32 with a more semantically correct formula that checks for wrapping around 0. Note: This will allow to not define TASK_SIZE_32 for the vdso headers in a future patch that will introduce asm/vdso/processor.h on arm64. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- arch/arm64/kernel/vdso32/vgettimeofday.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/vdso32/vgettimeofday.c b/arch/arm64/kernel/vdso32/vgettimeofday.c index 54fc1c2ce93f..91138077b073 100644 --- a/arch/arm64/kernel/vdso32/vgettimeofday.c +++ b/arch/arm64/kernel/vdso32/vgettimeofday.c @@ -8,11 +8,14 @@ #include <linux/time.h> #include <linux/types.h> +#define VALID_CLOCK_ID(x) \ + ((x >= 0) && (x < VDSO_BASES)) + int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts) { /* The checks below are required for ABI consistency with arm */ - if ((u32)ts >= TASK_SIZE_32) + if ((u32)ts > UINTPTR_MAX - sizeof(*ts) + 1) return -EFAULT; return __cvdso_clock_gettime32(clock, ts); @@ -22,7 +25,7 @@ int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts) { /* The checks below are required for ABI consistency with arm */ - if ((u32)ts >= TASK_SIZE_32) + if ((u32)ts > UINTPTR_MAX - sizeof(*ts) + 1) return -EFAULT; return __cvdso_clock_gettime(clock, ts); @@ -38,9 +41,12 @@ int __vdso_clock_getres(clockid_t clock_id, struct old_timespec32 *res) { /* The checks below are required for ABI consistency with arm */ - if ((u32)res >= TASK_SIZE_32) + if ((u32)res > UINTPTR_MAX - sizeof(res) + 1) return -EFAULT; + if (!VALID_CLOCK_ID(clock_id) && res == NULL) + return -EINVAL; + return __cvdso_clock_getres_time32(clock_id, res); } -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-17 12:24 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-17 12:21 [PATCH v4 00/26] Introduce common headers for vDSO Vincenzo Frascino 2020-03-17 12:21 ` Vincenzo Frascino 2020-03-17 12:21 ` [PATCH v4 01/26] linux/const.h: Extract common header " Vincenzo Frascino 2020-03-17 12:21 ` Vincenzo Frascino 2020-03-17 12:21 ` [PATCH v4 02/26] linux/bits.h: " Vincenzo Frascino 2020-03-17 12:21 ` Vincenzo Frascino 2020-03-17 12:21 ` [PATCH v4 03/26] linux/limits.h: " Vincenzo Frascino 2020-03-17 12:21 ` Vincenzo Frascino 2020-03-17 12:21 ` [PATCH v4 04/26] x86:Introduce asm/vdso/clocksource.h Vincenzo Frascino 2020-03-17 12:21 ` Vincenzo Frascino 2020-03-17 12:21 ` [PATCH v4 05/26] arm: Introduce asm/vdso/clocksource.h Vincenzo Frascino 2020-03-17 12:21 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 06/26] arm64: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 07/26] mips: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 08/26] linux/clocksource.h: Extract common header for vDSO Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 09/26] linux/math64.h: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 10/26] linux/time.h: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 11/26] linux/time32.h: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 12/26] linux/time64.h: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 13/26] linux/jiffies.h: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 14/26] linux/ktime.h: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 15/26] common: Introduce processor.h Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 16/26] scripts: Fix the inclusion order in modpost Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 17/26] linux/elfnote.h: Replace elf.h with UAPI equivalent Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino [this message] 2020-03-17 12:22 ` [PATCH v4 18/26] arm64: vdso32: Replace TASK_SIZE_32 check in vgettimeofday Vincenzo Frascino 2020-03-17 14:38 ` Catalin Marinas 2020-03-17 14:38 ` Catalin Marinas 2020-03-17 14:38 ` Catalin Marinas 2020-03-17 15:04 ` Vincenzo Frascino 2020-03-17 15:04 ` Vincenzo Frascino 2020-03-17 15:04 ` Vincenzo Frascino 2020-03-17 15:50 ` Catalin Marinas 2020-03-17 15:50 ` Catalin Marinas 2020-03-17 15:50 ` Catalin Marinas 2020-03-17 16:40 ` Vincenzo Frascino 2020-03-17 16:40 ` Vincenzo Frascino 2020-03-17 16:40 ` Vincenzo Frascino 2020-03-17 16:43 ` Vincenzo Frascino 2020-03-17 16:43 ` Vincenzo Frascino 2020-03-17 16:43 ` Vincenzo Frascino 2020-03-17 17:48 ` Catalin Marinas 2020-03-17 17:48 ` Catalin Marinas 2020-03-17 17:48 ` Catalin Marinas 2020-03-18 16:14 ` Vincenzo Frascino 2020-03-18 16:14 ` Vincenzo Frascino 2020-03-18 16:14 ` Vincenzo Frascino 2020-03-18 18:36 ` Catalin Marinas 2020-03-18 18:36 ` Catalin Marinas 2020-03-18 18:36 ` Catalin Marinas 2020-03-19 12:38 ` Vincenzo Frascino 2020-03-19 12:38 ` Vincenzo Frascino 2020-03-19 12:38 ` Vincenzo Frascino 2020-03-19 18:10 ` Catalin Marinas 2020-03-19 18:10 ` Catalin Marinas 2020-03-19 18:10 ` Catalin Marinas 2020-03-20 13:05 ` Vincenzo Frascino 2020-03-20 13:05 ` Vincenzo Frascino 2020-03-20 13:05 ` Vincenzo Frascino 2020-03-20 14:22 ` Catalin Marinas 2020-03-20 14:22 ` Catalin Marinas 2020-03-20 14:22 ` Catalin Marinas 2020-03-20 14:41 ` Vincenzo Frascino 2020-03-20 14:41 ` Vincenzo Frascino 2020-03-20 14:41 ` Vincenzo Frascino 2020-03-19 15:49 ` Andy Lutomirski 2020-03-19 15:49 ` Andy Lutomirski 2020-03-19 15:49 ` Andy Lutomirski 2020-03-19 16:58 ` Vincenzo Frascino 2020-03-19 16:58 ` Vincenzo Frascino 2020-03-19 16:58 ` Vincenzo Frascino 2020-03-19 18:32 ` Will Deacon 2020-03-19 18:32 ` Will Deacon 2020-03-19 18:32 ` Will Deacon 2020-03-21 14:33 ` [tip: timers/core] arm64: vdso32: Code clean up tip-bot2 for Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 19/26] arm64: Introduce asm/vdso/processor.h Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 17:52 ` Catalin Marinas 2020-03-17 17:52 ` Catalin Marinas 2020-03-17 17:52 ` Catalin Marinas 2020-03-17 12:22 ` [PATCH v4 20/26] arm64: vdso: Include common headers in the vdso library Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 21/26] arm64: vdso32: " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 22/26] mips: vdso: Enable mips to use common headers Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 23/26] x86: vdso: Enable x86 " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 24/26] arm: vdso: Enable arm " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 25/26] lib: vdso: Enable " Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` [PATCH v4 26/26] arm64: vdso32: Enable Clang Compilation Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino 2020-03-17 12:22 ` Vincenzo Frascino
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=20200317122220.30393-19-vincenzo.frascino@arm.com \ --to=vincenzo.frascino@arm.com \ --cc=0x7f454c46@gmail.com \ --cc=Mark.Rutland@arm.com \ --cc=arnd@arndb.de \ --cc=avagin@openvz.org \ --cc=bp@alien8.de \ --cc=catalin.marinas@arm.com \ --cc=clang-built-linux@googlegroups.com \ --cc=keescook@chromium.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=luto@kernel.org \ --cc=maz@kernel.org \ --cc=mingo@redhat.com \ --cc=ndesaulniers@google.com \ --cc=paul.burton@mips.com \ --cc=pcc@google.com \ --cc=salyzyn@android.com \ --cc=sboyd@kernel.org \ --cc=tglx@linutronix.de \ --cc=will.deacon@arm.com \ --cc=will@kernel.org \ --cc=x86@kernel.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 an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.