tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'x86_urgent_for_v6.1_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

- Do not hold fpregs lock when inheriting FPU permissions because the
fpregs lock disables preemption on RT but fpu_inherit_perms() does
spin_lock_irq(), which, on RT, uses rtmutexes and they need to be
preemptible.

- Check the page offset and the length of the data supplied by
userspace for overflow when specifying a set of pages to add to an
SGX enclave

* tag 'x86_urgent_for_v6.1_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/fpu: Drop fpregs lock before inheriting FPU permissions
x86/sgx: Add overflow check in sgx_validate_offset_length()

Linus Torvalds 894909f9 d4f754c3

+4 -1
+3
arch/x86/kernel/cpu/sgx/ioctl.c
··· 356 356 if (!length || !IS_ALIGNED(length, PAGE_SIZE)) 357 357 return -EINVAL; 358 358 359 + if (offset + length < offset) 360 + return -EINVAL; 361 + 359 362 if (offset + length - PAGE_SIZE >= encl->size) 360 363 return -EINVAL; 361 364
+1 -1
arch/x86/kernel/fpu/core.c
··· 605 605 if (test_thread_flag(TIF_NEED_FPU_LOAD)) 606 606 fpregs_restore_userregs(); 607 607 save_fpregs_to_fpstate(dst_fpu); 608 + fpregs_unlock(); 608 609 if (!(clone_flags & CLONE_THREAD)) 609 610 fpu_inherit_perms(dst_fpu); 610 - fpregs_unlock(); 611 611 612 612 /* 613 613 * Children never inherit PASID state.