On Mon, Sep 02, 2019 at 12:29:25pm +0100, Cristian Marussi wrote:
> Add 6 simple mangle testcases that mess with the ucontext_t from within
> the signal handler, trying to toggle PSTATE mode bits to trick the system
> into switching to EL1/EL2/EL3 using both SP_EL0(t) and SP_ELx(h).
> Expects SIGSEGV on test PASS.
>
> Signed-off-by: Cristian Marussi <cristian.marussi@xxxxxxx>
We might be able to squash this down further using a single .c file and
passing some magic -D option on the compiler command line, but it's
probably not worth it.
This removes most of the actual code duplication already.
So,
Reviewed-by: Dave Martin <Dave.Martin@xxxxxxx>
> ---
> v3 --> v4
> - fixed commit message
> - macroization
> - splitted into 6 macro-ised testcases to address t/h SP selection modes
> - added test description
> ---
> .../mangle_pstate_invalid_mode_el1h.c | 15 ++++++++++
> .../mangle_pstate_invalid_mode_el1t.c | 15 ++++++++++
> .../mangle_pstate_invalid_mode_el2h.c | 15 ++++++++++
> .../mangle_pstate_invalid_mode_el2t.c | 15 ++++++++++
> .../mangle_pstate_invalid_mode_el3h.c | 15 ++++++++++
> .../mangle_pstate_invalid_mode_el3t.c | 15 ++++++++++
> .../mangle_pstate_invalid_mode_template.h | 28 +++++++++++++++++++
> 7 files changed, 118 insertions(+)
> create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1h.c
> create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1t.c
> create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2h.c
> create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2t.c
> create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3h.c
> create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3t.c
> create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_template.h
>
> diff --git a/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1h.c b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1h.c
> new file mode 100644
> index 000000000000..95f821abdf46
> --- /dev/null
> +++ b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1h.c
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2019 ARM Limited
> + *
> + * Try to mangle the ucontext from inside a signal handler, toggling
> + * the mode bit to escalate exception level: this attempt must be spotted
> + * by Kernel and the test case is expected to be termninated via SEGV.
> + */
> +
> +#include "test_signals_utils.h"
> +#include "testcases.h"
> +
> +#include "mangle_pstate_invalid_mode_template.h"
> +
> +DEFINE_TESTCASE_MANGLE_PSTATE_INVALID_MODE(1h);
> diff --git a/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1t.c b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1t.c
> new file mode 100644
> index 000000000000..cc222d8a618a
> --- /dev/null
> +++ b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1t.c
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2019 ARM Limited
> + *
> + * Try to mangle the ucontext from inside a signal handler, toggling
> + * the mode bit to escalate exception level: this attempt must be spotted
> + * by Kernel and the test case is expected to be termninated via SEGV.
> + */
> +
> +#include "test_signals_utils.h"
> +#include "testcases.h"
> +
> +#include "mangle_pstate_invalid_mode_template.h"
> +
> +DEFINE_TESTCASE_MANGLE_PSTATE_INVALID_MODE(1t);
> diff --git a/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2h.c b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2h.c
> new file mode 100644
> index 000000000000..2188add7d28c
> --- /dev/null
> +++ b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2h.c
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2019 ARM Limited
> + *
> + * Try to mangle the ucontext from inside a signal handler, toggling
> + * the mode bit to escalate exception level: this attempt must be spotted
> + * by Kernel and the test case is expected to be termninated via SEGV.
> + */
> +
> +#include "test_signals_utils.h"
> +#include "testcases.h"
> +
> +#include "mangle_pstate_invalid_mode_template.h"
> +
> +DEFINE_TESTCASE_MANGLE_PSTATE_INVALID_MODE(2h);
> diff --git a/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2t.c b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2t.c
> new file mode 100644
> index 000000000000..df32dd5a479c
> --- /dev/null
> +++ b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2t.c
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2019 ARM Limited
> + *
> + * Try to mangle the ucontext from inside a signal handler, toggling
> + * the mode bit to escalate exception level: this attempt must be spotted
> + * by Kernel and the test case is expected to be termninated via SEGV.
> + */
> +
> +#include "test_signals_utils.h"
> +#include "testcases.h"
> +
> +#include "mangle_pstate_invalid_mode_template.h"
> +
> +DEFINE_TESTCASE_MANGLE_PSTATE_INVALID_MODE(2t);
> diff --git a/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3h.c b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3h.c
> new file mode 100644
> index 000000000000..9e6829b7e5db
> --- /dev/null
> +++ b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3h.c
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2019 ARM Limited
> + *
> + * Try to mangle the ucontext from inside a signal handler, toggling
> + * the mode bit to escalate exception level: this attempt must be spotted
> + * by Kernel and the test case is expected to be termninated via SEGV.
> + */
> +
> +#include "test_signals_utils.h"
> +#include "testcases.h"
> +
> +#include "mangle_pstate_invalid_mode_template.h"
> +
> +DEFINE_TESTCASE_MANGLE_PSTATE_INVALID_MODE(3h);
> diff --git a/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3t.c b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3t.c
> new file mode 100644
> index 000000000000..5685a4f10d06
> --- /dev/null
> +++ b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3t.c
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2019 ARM Limited
> + *
> + * Try to mangle the ucontext from inside a signal handler, toggling
> + * the mode bit to escalate exception level: this attempt must be spotted
> + * by Kernel and the test case is expected to be termninated via SEGV.
> + */
> +
> +#include "test_signals_utils.h"
> +#include "testcases.h"
> +
> +#include "mangle_pstate_invalid_mode_template.h"
> +
> +DEFINE_TESTCASE_MANGLE_PSTATE_INVALID_MODE(3t);
> diff --git a/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_template.h b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_template.h
> new file mode 100644
> index 000000000000..f5bf1804d858
> --- /dev/null
> +++ b/tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_template.h
> @@ -0,0 +1,28 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (C) 2019 ARM Limited
> + *
> + * Utility macro to ease definition of testcases toggling mode EL
> + */
> +
> +#define DEFINE_TESTCASE_MANGLE_PSTATE_INVALID_MODE(_mode) \
> + \
> +static int mangle_invalid_pstate_run(struct tdescr *td, siginfo_t *si, \
> + ucontext_t *uc) \
> +{ \
> + ASSERT_GOOD_CONTEXT(uc); \
> + \
> + uc->uc_mcontext.pstate &= ~PSR_MODE_MASK; \
> + uc->uc_mcontext.pstate |= PSR_MODE_EL ## _mode; \
> + \
> + return 1; \
> +} \
> + \
> +struct tdescr tde = { \
> + .sanity_disabled = true, \
> + .name = "MANGLE_PSTATE_INVALID_MODE_EL"#_mode, \
> + .descr = "Mangling uc_mcontext INVALID MODE EL"#_mode, \
> + .sig_trig = SIGUSR1, \
> + .sig_ok = SIGSEGV, \
> + .run = mangle_invalid_pstate_run, \
> +}
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
