Commit 19caf581 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Thomas Gleixner:
 "A set of x86 fixes:

   - Prevent potential NULL pointer dereferences in the HPET and HyperV
     code

   - Exclude the GART aperture from /proc/kcore to prevent kernel
     crashes on access

   - Use the correct macros for Cyrix I/O on Geode processors

   - Remove yet another kernel address printk leak

   - Announce microcode reload completion as requested by quite some
     people. Microcode loading has become popular recently.

   - Some 'Make Clang' happy fixlets

   - A few cleanups for recently added code"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/gart: Exclude GART aperture from kcore
  x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error
  x86/mm/pti: Make local symbols static
  x86/cpu/cyrix: Remove {get,set}Cx86_old macros used for Cyrix processors
  x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors
  x86/microcode: Announce reload operation's completion
  x86/hyperv: Prevent potential NULL pointer dereference
  x86/hpet: Prevent potential NULL pointer dereference
  x86/lib: Fix indentation issue, remove extra tab
  x86/boot: Restrict header scope to make Clang happy
  x86/mm: Don't leak kernel addresses
  x86/cpufeature: Fix various quality problems in the <asm/cpu_device_hd.h> header
parents a75eda7b ffc8599a

arch/x86/boot/string.c

+2 −1
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ 
 */



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/compiler.h>

#include <linux/errno.h>

#include <linux/limits.h>

#include <asm/asm.h>

#include "ctype.h"

#include "string.h"

arch/x86/hyperv/hv_init.c

+5 −1
Original line number Diff line number Diff line
@@ -103,9 +103,13 @@ static int hv_cpu_init(unsigned int cpu) 
	u64 msr_vp_index;

	struct hv_vp_assist_page **hvp = &hv_vp_assist_page[smp_processor_id()];

	void **input_arg;

	struct page *pg;



	input_arg = (void **)this_cpu_ptr(hyperv_pcpu_input_arg);

	*input_arg = page_address(alloc_page(GFP_KERNEL));

	pg = alloc_page(GFP_KERNEL);

	if (unlikely(!pg))

		return -ENOMEM;

	*input_arg = page_address(pg);



	hv_get_vp_index(msr_vp_index);

arch/x86/include/asm/cpu_device_id.h

+15 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _CPU_DEVICE_ID

#define _CPU_DEVICE_ID 1

#ifndef _ASM_X86_CPU_DEVICE_ID

#define _ASM_X86_CPU_DEVICE_ID



/*

 * Declare drivers belonging to specific x86 CPUs
@@ -9,8 +9,6 @@ 


#include <linux/mod_devicetable.h>



extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);



/*

 * Match specific microcode revisions.

 *
@@ -22,21 +20,22 @@ extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match); 
 */



struct x86_cpu_desc {

	__u8	x86_family;

	__u8	x86_vendor;

	__u8	x86_model;

	__u8	x86_stepping;

	__u32	x86_microcode_rev;

	u8	x86_family;

	u8	x86_vendor;

	u8	x86_model;

	u8	x86_stepping;

	u32	x86_microcode_rev;

};



#define INTEL_CPU_DESC(mod, step, rev) {			\

#define INTEL_CPU_DESC(model, stepping, revision) {		\

	.x86_family		= 6,				\

	.x86_vendor		= X86_VENDOR_INTEL,		\

	.x86_model = mod,					\

	.x86_stepping = step,					\

	.x86_microcode_rev = rev,				\

	.x86_model		= (model),			\

	.x86_stepping		= (stepping),			\

	.x86_microcode_rev	= (revision),			\

}



extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);

extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);



#endif
 
#endif /* _ASM_X86_CPU_DEVICE_ID */

arch/x86/include/asm/processor-cyrix.h

+0 −21
Original line number Diff line number Diff line
@@ -3,19 +3,6 @@ 
 * NSC/Cyrix CPU indexed register access. Must be inlined instead of

 * macros to ensure correct access ordering

 * Access order is always 0x22 (=offset), 0x23 (=value)

 *

 * When using the old macros a line like

 *   setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);

 * gets expanded to:

 *  do {

 *    outb((CX86_CCR2), 0x22);

 *    outb((({

 *        outb((CX86_CCR2), 0x22);

 *        inb(0x23);

 *    }) | 0x88), 0x23);

 *  } while (0);

 *

 * which in fact violates the access order (= 0x22, 0x22, 0x23, 0x23).

 */



static inline u8 getCx86(u8 reg)
@@ -29,11 +16,3 @@ static inline void setCx86(u8 reg, u8 data) 
	outb(reg, 0x22);

	outb(data, 0x23);

}
 


#define getCx86_old(reg) ({ outb((reg), 0x22); inb(0x23); })



#define setCx86_old(reg, data) do { \

	outb((reg), 0x22); \

	outb((data), 0x23); \

} while (0)

arch/x86/kernel/aperture_64.c

+13 −7
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define pr_fmt(fmt) "AGP: " fmt



#include <linux/kernel.h>

#include <linux/kcore.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/memblock.h>
@@ -57,7 +58,7 @@ int fallback_aper_force __initdata; 


int fix_aperture __initdata = 1;



#ifdef CONFIG_PROC_VMCORE

#if defined(CONFIG_PROC_VMCORE) || defined(CONFIG_PROC_KCORE)

/*

 * If the first kernel maps the aperture over e820 RAM, the kdump kernel will

 * use the same range because it will remain configured in the northbridge.
@@ -66,20 +67,25 @@ int fix_aperture __initdata = 1; 
 */

static unsigned long aperture_pfn_start, aperture_page_count;



static int gart_oldmem_pfn_is_ram(unsigned long pfn)

static int gart_mem_pfn_is_ram(unsigned long pfn)

{

	return likely((pfn < aperture_pfn_start) ||

		      (pfn >= aperture_pfn_start + aperture_page_count));

}



static void exclude_from_vmcore(u64 aper_base, u32 aper_order)

static void __init exclude_from_core(u64 aper_base, u32 aper_order)

{

	aperture_pfn_start = aper_base >> PAGE_SHIFT;

	aperture_page_count = (32 * 1024 * 1024) << aper_order >> PAGE_SHIFT;

	WARN_ON(register_oldmem_pfn_is_ram(&gart_oldmem_pfn_is_ram));

#ifdef CONFIG_PROC_VMCORE

	WARN_ON(register_oldmem_pfn_is_ram(&gart_mem_pfn_is_ram));

#endif

#ifdef CONFIG_PROC_KCORE

	WARN_ON(register_mem_pfn_is_ram(&gart_mem_pfn_is_ram));

#endif

}

#else

static void exclude_from_vmcore(u64 aper_base, u32 aper_order)

static void exclude_from_core(u64 aper_base, u32 aper_order)

{

}

#endif
@@ -474,7 +480,7 @@ out: 
			 * may have allocated the range over its e820 RAM

			 * and fixed up the northbridge

			 */

			exclude_from_vmcore(last_aper_base, last_aper_order);

			exclude_from_core(last_aper_base, last_aper_order);



			return 1;

		}
@@ -520,7 +526,7 @@ out: 
	 * overlap with the first kernel's memory. We can't access the

	 * range through vmcore even though it should be part of the dump.

	 */

	exclude_from_vmcore(aper_alloc, aper_order);

	exclude_from_core(aper_alloc, aper_order);



	/* Fix up the north bridges */

	for (i = 0; i < amd_nb_bus_dev_ranges[i].dev_limit; i++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE