Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'x86_urgent_for_v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov:
- Fix the vDSO exception handling return path to disable interrupts
again.
- A fix for the CE collector to return the proper return values to its
callers which are used to convey what the collector has done with the
error address.
* tag 'x86_urgent_for_v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/traps: Correct exc_general_protection() and math_error() return paths
RAS/CEC: Correct ce_add_elem()'s returned values
+14
-5
+2
-2
arch/x86/kernel/traps.c
+2
-2
arch/x86/kernel/traps.c
···
556
556
tsk->thread.trap_nr = X86_TRAP_GP;
557
557
558
558
if (fixup_vdso_exception(regs, X86_TRAP_GP, error_code, 0))
559
-
return;
559
+
goto exit;
560
560
561
561
show_signal(tsk, SIGSEGV, "", desc, regs, error_code);
562
562
force_sig(SIGSEGV);
···
1057
1057
goto exit;
1058
1058
1059
1059
if (fixup_vdso_exception(regs, trapnr, 0, 0))
1060
-
return;
1060
+
goto exit;
1061
1061
1062
1062
force_sig_fault(SIGFPE, si_code,
1063
1063
(void __user *)uprobe_get_trap_addr(regs));
+12
-3
drivers/ras/cec.c
+12
-3
drivers/ras/cec.c
···
309
309
return ret;
310
310
}
311
311
312
+
/**
313
+
* cec_add_elem - Add an element to the CEC array.
314
+
* @pfn: page frame number to insert
315
+
*
316
+
* Return values:
317
+
* - <0: on error
318
+
* - 0: on success
319
+
* - >0: when the inserted pfn was offlined
320
+
*/
312
321
static int cec_add_elem(u64 pfn)
313
322
{
314
323
struct ce_array *ca = &ce_arr;
324
+
int count, err, ret = 0;
315
325
unsigned int to = 0;
316
-
int count, ret = 0;
317
326
318
327
/*
319
328
* We can be called very early on the identify_cpu() path where we are
···
339
330
if (ca->n == MAX_ELEMS)
340
331
WARN_ON(!del_lru_elem_unlocked(ca));
341
332
342
-
ret = find_elem(ca, pfn, &to);
343
-
if (ret < 0) {
333
+
err = find_elem(ca, pfn, &to);
334
+
if (err < 0) {
344
335
/*
345
336
* Shift range [to-end] to make room for one more element.
346
337
*/