From: Dave Martin <Dave.Martin@arm.com> To: Cristian Marussi <cristian.marussi@arm.com> Cc: linux-kselftest@vger.kernel.org, linux-arm-kernel@lists.infradead.org, shuah@kernel.org, andreyknvl@google.com Subject: Re: [PATCH 13/13] kselftest: arm64: fake_sigreturn_overflow_reserved Date: Fri, 21 Jun 2019 11:36:23 +0100 [thread overview] Message-ID: <20190621103623.GU2790@e103592.cambridge.arm.com> (raw) In-Reply-To: <20190613111335.7645-14-cristian.marussi@arm.com> On Thu, Jun 13, 2019 at 12:13:35PM +0100, Cristian Marussi wrote: > Added a simple fake_sigreturn testcase which builds a ucontext_t > with the whole __reserved area overflowed with ESR_MAGIC headers > and place it onto the stack. > Expects a SIGSEGV on test PASS. > > Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> > --- > .../arm64/signal/testcases/.gitignore | 1 + > .../fake_sigreturn_overflow_reserved.c | 48 +++++++++++++++++++ > 2 files changed, 49 insertions(+) > create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c > > diff --git a/tools/testing/selftests/arm64/signal/testcases/.gitignore b/tools/testing/selftests/arm64/signal/testcases/.gitignore > index 66ba865b3b7e..69a18391c220 100644 > --- a/tools/testing/selftests/arm64/signal/testcases/.gitignore > +++ b/tools/testing/selftests/arm64/signal/testcases/.gitignore > @@ -10,3 +10,4 @@ fake_sigreturn_misaligned > fake_sigreturn_bad_magic > fake_sigreturn_bad_size > fake_sigreturn_bad_size_for_magic0 > +fake_sigreturn_overflow_reserved > diff --git a/tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c b/tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c > new file mode 100644 > index 000000000000..eba109453a65 > --- /dev/null > +++ b/tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c > @@ -0,0 +1,48 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* Copyright (C) 2019 ARM Limited */ > + > +#include <asm/sigcontext.h> > +#include <ucontext.h> > +#include <stdio.h> > + > +#include "test_signals_utils.h" > +#include "testcases.h" > + > +struct a_sigframe sf; > + > +static int fake_sigreturn_overflow_reserved_run(struct tdescr *td, > + siginfo_t *si, > + ucontext_t *uc) > +{ > + size_t offset = 0; > + struct _aarch64_ctx *head = GET_SF_RESV_HEAD(sf); > + > + /* just to fill the ucontext_t with something real */ > + if (!get_current_context(td, &sf.uc)) > + return 1; > + > + /* find the terminator, preserving existig headers */ > + head = get_terminator(head, GET_SF_RESV_SIZE(sf), &offset); > + if (head) { > + /* fill the __reserved area till the end */ > + do { > + head->magic = ESR_MAGIC; Comment on why this magic is chosen. Since it is useful for test purposes to have a record that the kernel ignores completely, it might be worth dropping in comment in parse_user_sigframe() so that we don't add stricter checks by accident. We could alternatively add a special-purpose dummy record with its own magic. This might be better than abusing esr_context ... but I could be persuaded either way. > + head->size = sizeof(struct esr_context); Can we end up with a hole at the end of the frame that is smaller than esr_context and so can't be filled properly? If not, why not? > + offset += head->size; > + head = GET_RESV_NEXT_HEAD(head); > + } while (offset < GET_SF_RESV_SIZE(sf)); > + > + ASSERT_BAD_CONTEXT(&sf.uc); > + fake_sigreturn(&sf, sizeof(sf), 16); We should have something that looks like a valid terminator after the end of the signal frame, so that we can be sure the overrun is detected, rather than the kernel just rejecting the garbage after the last record. > + } > + > + return 1; > +} [...] Cheers ---Dave
WARNING: multiple messages have this Message-ID (diff)
From: Dave Martin <Dave.Martin@arm.com> To: Cristian Marussi <cristian.marussi@arm.com> Cc: andreyknvl@google.com, shuah@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH 13/13] kselftest: arm64: fake_sigreturn_overflow_reserved Date: Fri, 21 Jun 2019 11:36:23 +0100 [thread overview] Message-ID: <20190621103623.GU2790@e103592.cambridge.arm.com> (raw) In-Reply-To: <20190613111335.7645-14-cristian.marussi@arm.com> On Thu, Jun 13, 2019 at 12:13:35PM +0100, Cristian Marussi wrote: > Added a simple fake_sigreturn testcase which builds a ucontext_t > with the whole __reserved area overflowed with ESR_MAGIC headers > and place it onto the stack. > Expects a SIGSEGV on test PASS. > > Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> > --- > .../arm64/signal/testcases/.gitignore | 1 + > .../fake_sigreturn_overflow_reserved.c | 48 +++++++++++++++++++ > 2 files changed, 49 insertions(+) > create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c > > diff --git a/tools/testing/selftests/arm64/signal/testcases/.gitignore b/tools/testing/selftests/arm64/signal/testcases/.gitignore > index 66ba865b3b7e..69a18391c220 100644 > --- a/tools/testing/selftests/arm64/signal/testcases/.gitignore > +++ b/tools/testing/selftests/arm64/signal/testcases/.gitignore > @@ -10,3 +10,4 @@ fake_sigreturn_misaligned > fake_sigreturn_bad_magic > fake_sigreturn_bad_size > fake_sigreturn_bad_size_for_magic0 > +fake_sigreturn_overflow_reserved > diff --git a/tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c b/tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c > new file mode 100644 > index 000000000000..eba109453a65 > --- /dev/null > +++ b/tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_overflow_reserved.c > @@ -0,0 +1,48 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* Copyright (C) 2019 ARM Limited */ > + > +#include <asm/sigcontext.h> > +#include <ucontext.h> > +#include <stdio.h> > + > +#include "test_signals_utils.h" > +#include "testcases.h" > + > +struct a_sigframe sf; > + > +static int fake_sigreturn_overflow_reserved_run(struct tdescr *td, > + siginfo_t *si, > + ucontext_t *uc) > +{ > + size_t offset = 0; > + struct _aarch64_ctx *head = GET_SF_RESV_HEAD(sf); > + > + /* just to fill the ucontext_t with something real */ > + if (!get_current_context(td, &sf.uc)) > + return 1; > + > + /* find the terminator, preserving existig headers */ > + head = get_terminator(head, GET_SF_RESV_SIZE(sf), &offset); > + if (head) { > + /* fill the __reserved area till the end */ > + do { > + head->magic = ESR_MAGIC; Comment on why this magic is chosen. Since it is useful for test purposes to have a record that the kernel ignores completely, it might be worth dropping in comment in parse_user_sigframe() so that we don't add stricter checks by accident. We could alternatively add a special-purpose dummy record with its own magic. This might be better than abusing esr_context ... but I could be persuaded either way. > + head->size = sizeof(struct esr_context); Can we end up with a hole at the end of the frame that is smaller than esr_context and so can't be filled properly? If not, why not? > + offset += head->size; > + head = GET_RESV_NEXT_HEAD(head); > + } while (offset < GET_SF_RESV_SIZE(sf)); > + > + ASSERT_BAD_CONTEXT(&sf.uc); > + fake_sigreturn(&sf, sizeof(sf), 16); We should have something that looks like a valid terminator after the end of the signal frame, so that we can be sure the overrun is detected, rather than the kernel just rejecting the garbage after the last record. > + } > + > + return 1; > +} [...] Cheers ---Dave _______________________________________________ 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:[~2019-06-21 10:36 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-13 11:13 [PATCH 00/13] Add arm64/signal initial kselftest support Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-13 11:13 ` [PATCH 01/13] kselftest: arm64: introduce new boilerplate code Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:34 ` Dave Martin 2019-06-21 10:34 ` Dave Martin 2019-06-13 11:13 ` [PATCH 02/13] kselftest: arm64: adds arm64/signal support code Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:35 ` Dave Martin 2019-06-21 10:35 ` Dave Martin 2019-06-28 18:53 ` Cristian Marussi 2019-06-28 18:53 ` Cristian Marussi 2019-06-13 11:13 ` [PATCH 03/13] kselftest: arm64: mangle_sp_misaligned Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:35 ` Dave Martin 2019-06-21 10:35 ` Dave Martin 2019-07-02 15:39 ` Cristian Marussi 2019-07-02 15:39 ` Cristian Marussi 2019-07-03 8:39 ` Dave P Martin 2019-07-03 8:39 ` Dave P Martin 2019-06-13 11:13 ` [PATCH 04/13] kselftest: arm64: mangle_pc_invalid Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:35 ` Dave Martin 2019-06-21 10:35 ` Dave Martin 2019-06-13 11:13 ` [PATCH 05/13] kselftest: arm64: mangle_pstate_invalid_daif_bits Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:35 ` Dave Martin 2019-06-21 10:35 ` Dave Martin 2019-06-13 11:13 ` [PATCH 06/13] kselftest: arm64: mangle_pstate_invalid_state_toggle Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:35 ` Dave Martin 2019-06-21 10:35 ` Dave Martin 2019-06-13 11:13 ` [PATCH 07/13] kselftest: arm64: mangle_pstate_invalid_mode_el? Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:35 ` Dave Martin 2019-06-21 10:35 ` Dave Martin 2019-06-13 11:13 ` [PATCH 08/13] kselftest: arm64: mangle_pstate_ssbs_regs Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:35 ` Dave Martin 2019-06-21 10:35 ` Dave Martin 2019-07-02 15:51 ` Cristian Marussi 2019-07-02 15:51 ` Cristian Marussi 2019-07-03 8:56 ` Dave Martin 2019-07-03 8:56 ` Dave Martin 2019-06-13 11:13 ` [PATCH 09/13] kselftest: arm64: fake_sigreturn_misaligned Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:36 ` Dave Martin 2019-06-21 10:36 ` Dave Martin 2019-06-13 11:13 ` [PATCH 10/13] kselftest: arm64: fake_sigreturn_bad_magic Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:36 ` Dave Martin 2019-06-21 10:36 ` Dave Martin 2019-07-03 17:41 ` Cristian Marussi 2019-07-03 17:41 ` Cristian Marussi 2019-06-13 11:13 ` [PATCH 11/13] kselftest: arm64: fake_sigreturn_bad_size Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:36 ` Dave Martin 2019-06-21 10:36 ` Dave Martin 2019-07-03 17:46 ` Cristian Marussi 2019-07-03 17:46 ` Cristian Marussi 2019-06-13 11:13 ` [PATCH 12/13] kselftest: arm64: fake_sigreturn_bad_size_for_magic0 Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:36 ` Dave Martin 2019-06-21 10:36 ` Dave Martin 2019-07-03 17:50 ` Cristian Marussi 2019-07-03 17:50 ` Cristian Marussi 2019-06-13 11:13 ` [PATCH 13/13] kselftest: arm64: fake_sigreturn_overflow_reserved Cristian Marussi 2019-06-13 11:13 ` Cristian Marussi 2019-06-21 10:36 ` Dave Martin [this message] 2019-06-21 10:36 ` Dave Martin 2019-07-03 17:51 ` Cristian Marussi 2019-07-03 17:51 ` Cristian Marussi 2019-06-21 10:34 ` [PATCH 00/13] Add arm64/signal initial kselftest support Dave Martin 2019-06-21 10:34 ` Dave Martin
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=20190621103623.GU2790@e103592.cambridge.arm.com \ --to=dave.martin@arm.com \ --cc=andreyknvl@google.com \ --cc=cristian.marussi@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=shuah@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.