Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit ca04d396a322 · 2015-11-01T11:45:26.000-08:00
Pull x86 fixes from Thomas Gleixner:
 "This set of updates contains:

   - Another bugfix for the pathologic vm86 machinery.  Clear
     thread.vm86 on fork to prevent corrupting the parent state.  This
     comes along with an update to the vm86 selftest case

   - Fix another corner case in the ioapic setup code which causes a
     boot crash on some oddball systems

   - Fix the fallout from the dma allocation consolidation work, which
     leads to a NULL pointer dereference when the allocation code is
     called with a NULL device"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vm86: Set thread.vm86 to NULL on fork/clone
  selftests/x86: Add a fork() to entry_from_vm86 to catch fork bugs
  x86/ioapic: Prevent NULL pointer dereference in setup_ioapic_dest()
  x86/dma-mapping: Fix arch_dma_alloc_attrs() oops with NULL dev
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
@@ -2547,7 +2547,9 @@ void __init setup_ioapic_dest(void)
 			mask = apic->target_cpus();
 
 		chip = irq_data_get_irq_chip(idata);
-		chip->irq_set_affinity(idata, mask, false);
+		/* Might be lapic_chip for irq 0 */
+		if (chip->irq_set_affinity)
+			chip->irq_set_affinity(idata, mask, false);
 	}
 }
 #endif
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
@@ -131,11 +131,12 @@ void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr,
 
 bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp)
 {
+	if (!*dev)
+		*dev = &x86_dma_fallback_dev;
+
 	*gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
 	*gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp);
 
-	if (!*dev)
-		*dev = &x86_dma_fallback_dev;
 	if (!is_device_dma_capable(*dev))
 		return false;
 	return true;
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
@@ -84,6 +84,9 @@ EXPORT_SYMBOL_GPL(idle_notifier_unregister);
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 {
 	memcpy(dst, src, arch_task_struct_size);
+#ifdef CONFIG_VM86
+	dst->thread.vm86 = NULL;
+#endif
 
 	return fpu__copy(&dst->thread.fpu, &src->thread.fpu);
 }
diff --git a/tools/testing/selftests/x86/entry_from_vm86.c b/tools/testing/selftests/x86/entry_from_vm86.c
@@ -230,5 +230,9 @@ int main(void)
 	}
 	clearhandler(SIGSEGV);
 
+	/* Make sure nothing explodes if we fork. */
+	if (fork() > 0)
+		return 0;
+
 	return (nerrs == 0 ? 0 : 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -2547,7 +2547,9 @@ void __init setup_ioapic_dest(void)`
`2547`	`2547`	`mask = apic->target_cpus();`
`2548`	`2548`
`2549`	`2549`	`chip = irq_data_get_irq_chip(idata);`
`2550`		`- chip->irq_set_affinity(idata, mask, false);`
	`2550`	`+ /* Might be lapic_chip for irq 0 */`
	`2551`	`+ if (chip->irq_set_affinity)`
	`2552`	`+ chip->irq_set_affinity(idata, mask, false);`
`2551`	`2553`	`}`
`2552`	`2554`	`}`
`2553`	`2555`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ EXPORT_SYMBOL_GPL(idle_notifier_unregister);`
`84`	`84`	`int arch_dup_task_struct(struct task_struct dst, struct task_struct src)`
`85`	`85`	`{`
`86`	`86`	`memcpy(dst, src, arch_task_struct_size);`
	`87`	`+#ifdef CONFIG_VM86`
	`88`	`+ dst->thread.vm86 = NULL;`
	`89`	`+#endif`
`87`	`90`
`88`	`91`	`return fpu__copy(&dst->thread.fpu, &src->thread.fpu);`
`89`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,5 +230,9 @@ int main(void)`
`230`	`230`	`}`
`231`	`231`	`clearhandler(SIGSEGV);`
`232`	`232`
	`233`	`+ /* Make sure nothing explodes if we fork. */`
	`234`	`+ if (fork() > 0)`
	`235`	`+ return 0;`
	`236`	`+`
`233`	`237`	`return (nerrs == 0 ? 0 : 1);`
`234`	`238`	`}`