| Message ID | 20220801225926.3694639-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b721c8237fe39a0e3b653f47add3156f7cdccef2 |
| Headers | show |
| Series | kselftest/arm64: Fix validation of EXTRA_CONTEXT signal contexts | expand |
On Mon, Aug 01, 2022 at 11:59:26PM +0100, Mark Brown wrote: > Currently in validate_extra_context() we assert both that the extra data > pointed to by the EXTRA_CONTEXT is 16 byte aligned and that it immediately > follows the struct _aarch64_ctx providing the terminator for the linked I just realised that this is a very similar subject to another fix I sent for this stuff a few hours ago. Both fixes are needed, the code really is quite buggy. I've tweaked the subjects locally in case I need to resend - this one is: kselftest/arm64: Fix validation of EXTRA_CONTEXT signal contexts and the other is: kselftest/arm64: Fix validatation termination record after EXTRA_CONTEXT The good news is that with the patches I've now posted we no longer get any spurious failures, though further patches (which should emerge after the merge window) will be required to actually validate the data inside an EXTRA_CONTEXT.
diff --git a/tools/testing/selftests/arm64/signal/testcases/testcases.c b/tools/testing/selftests/arm64/signal/testcases/testcases.c index b2cce9afaaf3..0b3c9b4b1d39 100644 --- a/tools/testing/selftests/arm64/signal/testcases/testcases.c +++ b/tools/testing/selftests/arm64/signal/testcases/testcases.c @@ -42,7 +42,7 @@ bool validate_extra_context(struct extra_context *extra, char **err) *err = "Extra DATAP misaligned"; else if (extra->size & 0x0fUL) *err = "Extra SIZE misaligned"; - else if (extra->datap != (uint64_t)term + sizeof(*term)) + else if (extra->datap != (uint64_t)term + 0x10UL) *err = "Extra DATAP misplaced (not contiguous)"; if (*err) return false;
Currently in validate_extra_context() we assert both that the extra data pointed to by the EXTRA_CONTEXT is 16 byte aligned and that it immediately follows the struct _aarch64_ctx providing the terminator for the linked list of contexts in the signal frame. Since struct _aarch64_ctx is an 8 byte structure which must be 16 byte aligned these cannot both be true. As documented in sigcontext.h and implemented by the kernel the extra data should be at the next 16 byte aligned address after the terminator so fix the validation to match. Signed-off-by: Mark Brown <broonie@kernel.org> --- tools/testing/selftests/arm64/signal/testcases/testcases.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)