History

Merge tag 'x86_urgent_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov: "Two more urgent FPU fixes: - prevent unprivileged userspace from reinitializing supervisor states - prepare init_fpstate, which is the buffer used when initializing FPU state, properly in case the skip-writing-state-components XSAVE* variants are used" * tag 'x86_urgent_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/fpu: Make init_fpstate correct with optimized XSAVE x86/fpu: Preserve supervisor states in sanitize_restored_user_xstate()

Linus Torvalds committed 5 years ago

Commit 94ca94b2 parents edf54d9 f9dfb5e3 files · +54 −43Browse files

Unified · Split

3 files
  1. arch/x86/include/asm/fpu/internal.h +8 −22
  2. arch/x86/kernel/fpu/signal.c +8 −18
  3. arch/x86/kernel/fpu/xstate.c +38 −3
arch/x86/include/asm/fpu/internal.h+8−22
@@ -204,6 +204,14 @@ static inline void copy_fxregs_to_kernel(struct fpu *fpu) · 203 unmodified lines
204 asm volatile("fxsaveq %[fx]" : [fx] "=m" (fpu->state.fxsave));204 asm volatile("fxsaveq %[fx]" : [fx] "=m" (fpu->state.fxsave));
205}205}
206 206
207static inline void fxsave(struct fxregs_state *fx)
208{
209 if (IS_ENABLED(CONFIG_X86_32))
210 asm volatile( "fxsave %[fx]" : [fx] "=m" (*fx));
211 else
212 asm volatile("fxsaveq %[fx]" : [fx] "=m" (*fx));
213}
214
207/* These macros all use (%edi)/(%rdi) as the single memory argument. */215/* These macros all use (%edi)/(%rdi) as the single memory argument. */
208#define XSAVE ".byte " REX_PREFIX "0x0f,0xae,0x27"216#define XSAVE ".byte " REX_PREFIX "0x0f,0xae,0x27"
209#define XSAVEOPT ".byte " REX_PREFIX "0x0f,0xae,0x37"217#define XSAVEOPT ".byte " REX_PREFIX "0x0f,0xae,0x37"
@@ -268,28 +276,6 @@ static inline void copy_fxregs_to_kernel(struct fpu *fpu) · 58 unmodified lines
268 : "D" (st), "m" (*st), "a" (lmask), "d" (hmask) \276 : "D" (st), "m" (*st), "a" (lmask), "d" (hmask) \
269 : "memory")277 : "memory")
270 278
271/*
272 * This function is called only during boot time when x86 caps are not set
273 * up and alternative can not be used yet.
274 */
275static inline void copy_xregs_to_kernel_booting(struct xregs_state *xstate)
276{
277 u64 mask = xfeatures_mask_all;
278 u32 lmask = mask;
279 u32 hmask = mask >> 32;
280 int err;
281
282 WARN_ON(system_state != SYSTEM_BOOTING);
283
284 if (boot_cpu_has(X86_FEATURE_XSAVES))
285 XSTATE_OP(XSAVES, xstate, lmask, hmask, err);
286 else
287 XSTATE_OP(XSAVE, xstate, lmask, hmask, err);
288
289 /* We should never fault when copying to a kernel buffer: */
290 WARN_ON_FPU(err);
291}
292
293/*279/*
294 * This function is called only during boot time when x86 caps are not set280 * This function is called only during boot time when x86 caps are not set
295 * up and alternative can not be used yet.281 * up and alternative can not be used yet.
arch/x86/kernel/fpu/signal.c+8−18
@@ -221,28 +221,18 @@ sanitize_restored_user_xstate(union fpregs_state *state, · 220 unmodified lines
221 221
222 if (use_xsave()) {222 if (use_xsave()) {
223 /*223 /*
224 * Note: we don't need to zero the reserved bits in the224 * Clear all feature bits which are not set in
225 * xstate_header here because we either didn't copy them at all,225 * user_xfeatures and clear all extended features
226 * or we checked earlier that they aren't set.226 * for fx_only mode.
227 */227 */
228 u64 mask = fx_only ? XFEATURE_MASK_FPSSE : user_xfeatures;
228 229
229 /*230 /*
230 * 'user_xfeatures' might have bits clear which are231 * Supervisor state has to be preserved. The sigframe
231 * set in header->xfeatures. This represents features that232 * restore can only modify user features, i.e. @mask
232 * were in init state prior to a signal delivery, and need233 * cannot contain them.
233 * to be reset back to the init state. Clear any user
234 * feature bits which are set in the kernel buffer to get
235 * them back to the init state.
236 *
237 * Supervisor state is unchanged by input from userspace.
238 * Ensure supervisor state bits stay set and supervisor
239 * state is not modified.
240 */234 */
241 if (fx_only)235 header->xfeatures &= mask | xfeatures_mask_supervisor();
242 header->xfeatures = XFEATURE_MASK_FPSSE;
243 else
244 header->xfeatures &= user_xfeatures |
245 xfeatures_mask_supervisor();
246 }236 }
247 237
248 if (use_fxsr()) {238 if (use_fxsr()) {
arch/x86/kernel/fpu/xstate.c+38−3
@@ -440,6 +440,25 @@ static void __init print_xstate_offset_size(void) · 439 unmodified lines
440 }440 }
441}441}
442 442
443/*
444 * All supported features have either init state all zeros or are
445 * handled in setup_init_fpu() individually. This is an explicit
446 * feature list and does not use XFEATURE_MASK*SUPPORTED to catch
447 * newly added supported features at build time and make people
448 * actually look at the init state for the new feature.
449 */
450#define XFEATURES_INIT_FPSTATE_HANDLED \
451 (XFEATURE_MASK_FP | \
452 XFEATURE_MASK_SSE | \
453 XFEATURE_MASK_YMM | \
454 XFEATURE_MASK_OPMASK | \
455 XFEATURE_MASK_ZMM_Hi256 | \
456 XFEATURE_MASK_Hi16_ZMM | \
457 XFEATURE_MASK_PKRU | \
458 XFEATURE_MASK_BNDREGS | \
459 XFEATURE_MASK_BNDCSR | \
460 XFEATURE_MASK_PASID)
461
443/*462/*
444 * setup the xstate image representing the init state463 * setup the xstate image representing the init state
445 */464 */
@@ -447,6 +466,10 @@ static void __init setup_init_fpu_buf(void) · 1 unmodified line
447{466{
448 static int on_boot_cpu __initdata = 1;467 static int on_boot_cpu __initdata = 1;
449 468
469 BUILD_BUG_ON((XFEATURE_MASK_USER_SUPPORTED |
470 XFEATURE_MASK_SUPERVISOR_SUPPORTED) !=
471 XFEATURES_INIT_FPSTATE_HANDLED);
472
450 WARN_ON_FPU(!on_boot_cpu);473 WARN_ON_FPU(!on_boot_cpu);
451 on_boot_cpu = 0;474 on_boot_cpu = 0;
452 475
@@ -466,10 +489,22 @@ static void __init setup_init_fpu_buf(void) · 13 unmodified lines
466 copy_kernel_to_xregs_booting(&init_fpstate.xsave);489 copy_kernel_to_xregs_booting(&init_fpstate.xsave);
467 490
468 /*491 /*
469 * Dump the init state again. This is to identify the init state492 * All components are now in init state. Read the state back so
470 * of any feature which is not represented by all zero's.493 * that init_fpstate contains all non-zero init state. This only
494 * works with XSAVE, but not with XSAVEOPT and XSAVES because
495 * those use the init optimization which skips writing data for
496 * components in init state.
497 *
498 * XSAVE could be used, but that would require to reshuffle the
499 * data when XSAVES is available because XSAVES uses xstate
500 * compaction. But doing so is a pointless exercise because most
501 * components have an all zeros init state except for the legacy
502 * ones (FP and SSE). Those can be saved with FXSAVE into the
503 * legacy area. Adding new features requires to ensure that init
504 * state is all zeroes or if not to add the necessary handling
505 * here.
471 */506 */
472 copy_xregs_to_kernel_booting(&init_fpstate.xsave);507 fxsave(&init_fpstate.fxsave);
473}508}
474 509
475static int xfeature_uncompacted_offset(int xfeature_nr)510static int xfeature_uncompacted_offset(int xfeature_nr)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t