2024-06-15 08:15:55

by Ingo Molnar

[permalink] [raw]
Subject: [GIT PULL] x86 fixes

Linus,

Please pull the latest x86/urgent Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2024-06-15

# HEAD: b2747f108b8034271fd5289bd8f3a7003e0775a3 x86/boot: Don't add the EFI stub to targets, again

Misc fixes:

- Fix the 8 bytes get_user() logic on x86-32

- Fix build bug that creates weird & mistaken target directory under arch/x86/

Thanks,

Ingo

------------------>
Benjamin Segall (1):
x86/boot: Don't add the EFI stub to targets, again

Kees Cook (1):
x86/uaccess: Fix missed zeroing of ia32 u64 get_user() range checking


arch/x86/boot/compressed/Makefile | 4 ++--
arch/x86/include/asm/uaccess.h | 4 ++--
arch/x86/lib/getuser.S | 6 +++++-
3 files changed, 9 insertions(+), 5 deletions(-)


2024-06-15 18:37:03

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] x86 fixes

On Sat, 15 Jun 2024 at 01:13, Ingo Molnar <[email protected]> wrote:
>
> - Fix the 8 bytes get_user() logic on x86-32

This is clearly a fix, but I think it's a bit ugly.

Instead of adding _more_ special cases for size 8, we could just remove them.

Making the 8-bit two-word versions just clear %ecx before doing the
first load means that all the exception handling becomes entirely
unified.

And then you can just use a nice macro for all the user accesses, and
the #ifdefs go away entirely for all exception handling. All that
remains is the "do I do a 'movq' or an xor and two movl's" question.

Something ENTIRELY UNTESTED like this, IOW.

I did check that it seemed to generate sane code on both 32-bit and
64-bit, but no _actual_ testing.

Linus


Attachments:
patch.diff (3.53 kB)

2024-06-15 18:38:28

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] x86 fixes

The pull request you sent on Sat, 15 Jun 2024 10:13:20 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2024-06-15

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/08a6b55aa0c66b1c4f6ff35402c971420335b11c

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html