On Wed, 25 Nov 2020 at 03:15, Kees Cook keescook@chromium.org wrote:
On Mon, Nov 23, 2020 at 10:54:58AM -0500, Gabriel Krisman Bertazi wrote:
Gabriel Krisman Bertazi krisman@collabora.com writes:
Jann Horn jannh@google.com writes:
As part of fixing this, it might be a good idea to put "enum syscall_work_bit" behind a "#ifdef CONFIG_GENERIC_ENTRY" to avoid future accidents like this?
Hi Jan, Arnd,
That is correct. This is a copy pasta mistake. My apologies. I didn't have a !GENERIC_ENTRY device to test, but just the ifdef would have caught it.
I have patched it as suggested. Tested on qemu for arm32 and on bare metal for x86-64.
Once again, my apologies for the mistake.
-- >8 -- Subject: [PATCH] entry: Fix boot for !CONFIG_GENERIC_ENTRY
A copy-pasta mistake tries to set SYSCALL_WORK flags instead of TIF flags for !CONFIG_GENERIC_ENTRY. Also, add safeguards to catch this at compilation time.
This patch tested on arm64, arm, x86_64 and i386 and the reported issue got fixed.
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org Suggested-by: Jann Horn jannh@google.com Signed-off-by: Gabriel Krisman Bertazi krisman@collabora.com
Thanks for getting this fixed!
3136b93c3fb2 ("entry: Expose helpers to migrate TIF to SYSCALL_WORK flags") Reviewed-by: Kees Cook keescook@chromium.org
Tested-by: Naresh Kamboju naresh.kamboju@linaro.org
- Naresh