Commit f0e18b03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Borislav Petkov:

 - Free shmem backing storage for SGX enclave pages when those are
   swapped back into EPC memory

 - Prevent do_int3() from being kprobed, to avoid recursion

 - Remap setup_data and setup_indirect structures properly when
   accessing their members

 - Correct the alternatives patching order for modules too

* tag 'x86_urgent_for_v5.17_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sgx: Free backing memory after faulting the enclave page
  x86/traps: Mark do_int3() NOKPROBE_SYMBOL
  x86/boot: Add setup_indirect support in early_memremap_is_setup_data()
  x86/boot: Fix memremap of setup_indirect structures
  x86/module: Fix the paravirt vs alternative order
parents aad611a8 08999b24

arch/x86/kernel/cpu/sgx/encl.c

+48 −9
Original line number Diff line number Diff line
@@ -12,6 +12,30 @@ 
#include "encls.h"

#include "sgx.h"



/*

 * Calculate byte offset of a PCMD struct associated with an enclave page. PCMD's

 * follow right after the EPC data in the backing storage. In addition to the

 * visible enclave pages, there's one extra page slot for SECS, before PCMD

 * structs.

 */

static inline pgoff_t sgx_encl_get_backing_page_pcmd_offset(struct sgx_encl *encl,

							    unsigned long page_index)

{

	pgoff_t epc_end_off = encl->size + sizeof(struct sgx_secs);



	return epc_end_off + page_index * sizeof(struct sgx_pcmd);

}



/*

 * Free a page from the backing storage in the given page index.

 */

static inline void sgx_encl_truncate_backing_page(struct sgx_encl *encl, unsigned long page_index)

{

	struct inode *inode = file_inode(encl->backing);



	shmem_truncate_range(inode, PFN_PHYS(page_index), PFN_PHYS(page_index) + PAGE_SIZE - 1);

}



/*

 * ELDU: Load an EPC page as unblocked. For more info, see "OS Management of EPC

 * Pages" in the SDM.
@@ -22,9 +46,11 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, 
{

	unsigned long va_offset = encl_page->desc & SGX_ENCL_PAGE_VA_OFFSET_MASK;

	struct sgx_encl *encl = encl_page->encl;

	pgoff_t page_index, page_pcmd_off;

	struct sgx_pageinfo pginfo;

	struct sgx_backing b;

	pgoff_t page_index;

	bool pcmd_page_empty;

	u8 *pcmd_page;

	int ret;



	if (secs_page)
@@ -32,14 +58,16 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, 
	else

		page_index = PFN_DOWN(encl->size);



	page_pcmd_off = sgx_encl_get_backing_page_pcmd_offset(encl, page_index);



	ret = sgx_encl_get_backing(encl, page_index, &b);

	if (ret)

		return ret;



	pginfo.addr = encl_page->desc & PAGE_MASK;

	pginfo.contents = (unsigned long)kmap_atomic(b.contents);

	pginfo.metadata = (unsigned long)kmap_atomic(b.pcmd) +

			  b.pcmd_offset;

	pcmd_page = kmap_atomic(b.pcmd);

	pginfo.metadata = (unsigned long)pcmd_page + b.pcmd_offset;



	if (secs_page)

		pginfo.secs = (u64)sgx_get_epc_virt_addr(secs_page);
@@ -55,11 +83,24 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, 
		ret = -EFAULT;

	}



	kunmap_atomic((void *)(unsigned long)(pginfo.metadata - b.pcmd_offset));

	memset(pcmd_page + b.pcmd_offset, 0, sizeof(struct sgx_pcmd));



	/*

	 * The area for the PCMD in the page was zeroed above.  Check if the

	 * whole page is now empty meaning that all PCMD's have been zeroed:

	 */

	pcmd_page_empty = !memchr_inv(pcmd_page, 0, PAGE_SIZE);



	kunmap_atomic(pcmd_page);

	kunmap_atomic((void *)(unsigned long)pginfo.contents);



	sgx_encl_put_backing(&b, false);



	sgx_encl_truncate_backing_page(encl, page_index);



	if (pcmd_page_empty)

		sgx_encl_truncate_backing_page(encl, PFN_DOWN(page_pcmd_off));



	return ret;

}
@@ -579,7 +620,7 @@ static struct page *sgx_encl_get_backing_page(struct sgx_encl *encl, 
int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index,

			 struct sgx_backing *backing)

{

	pgoff_t pcmd_index = PFN_DOWN(encl->size) + 1 + (page_index >> 5);

	pgoff_t page_pcmd_off = sgx_encl_get_backing_page_pcmd_offset(encl, page_index);

	struct page *contents;

	struct page *pcmd;
@@ -587,7 +628,7 @@ int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, 
	if (IS_ERR(contents))

		return PTR_ERR(contents);



	pcmd = sgx_encl_get_backing_page(encl, pcmd_index);

	pcmd = sgx_encl_get_backing_page(encl, PFN_DOWN(page_pcmd_off));

	if (IS_ERR(pcmd)) {

		put_page(contents);

		return PTR_ERR(pcmd);
@@ -596,9 +637,7 @@ int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, 
	backing->page_index = page_index;

	backing->contents = contents;

	backing->pcmd = pcmd;

	backing->pcmd_offset =

		(page_index & (PAGE_SIZE / sizeof(struct sgx_pcmd) - 1)) *

		sizeof(struct sgx_pcmd);

	backing->pcmd_offset = page_pcmd_off & (PAGE_SIZE - 1);



	return 0;

}

arch/x86/kernel/e820.c

+30 −11
Original line number Diff line number Diff line
@@ -995,8 +995,10 @@ early_param("memmap", parse_memmap_opt); 
 */

void __init e820__reserve_setup_data(void)

{

	struct setup_indirect *indirect;

	struct setup_data *data;

	u64 pa_data;

	u64 pa_data, pa_next;

	u32 len;



	pa_data = boot_params.hdr.setup_data;

	if (!pa_data)
@@ -1004,6 +1006,14 @@ void __init e820__reserve_setup_data(void) 


	while (pa_data) {

		data = early_memremap(pa_data, sizeof(*data));

		if (!data) {

			pr_warn("e820: failed to memremap setup_data entry\n");

			return;

		}



		len = sizeof(*data);

		pa_next = data->next;



		e820__range_update(pa_data, sizeof(*data)+data->len, E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);



		/*
@@ -1015,18 +1025,27 @@ void __init e820__reserve_setup_data(void) 
						 sizeof(*data) + data->len,

						 E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);



		if (data->type == SETUP_INDIRECT &&

		    ((struct setup_indirect *)data->data)->type != SETUP_INDIRECT) {

			e820__range_update(((struct setup_indirect *)data->data)->addr,

					   ((struct setup_indirect *)data->data)->len,

		if (data->type == SETUP_INDIRECT) {

			len += data->len;

			early_memunmap(data, sizeof(*data));

			data = early_memremap(pa_data, len);

			if (!data) {

				pr_warn("e820: failed to memremap indirect setup_data\n");

				return;

			}



			indirect = (struct setup_indirect *)data->data;



			if (indirect->type != SETUP_INDIRECT) {

				e820__range_update(indirect->addr, indirect->len,

						   E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);

			e820__range_update_kexec(((struct setup_indirect *)data->data)->addr,

						 ((struct setup_indirect *)data->data)->len,

				e820__range_update_kexec(indirect->addr, indirect->len,

							 E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);

			}

		}



		pa_data = data->next;

		early_memunmap(data, sizeof(*data));

		pa_data = pa_next;

		early_memunmap(data, len);

	}



	e820__update_table(e820_table);

arch/x86/kernel/kdebugfs.c

+28 −9
Original line number Diff line number Diff line
@@ -88,11 +88,13 @@ create_setup_data_node(struct dentry *parent, int no, 


static int __init create_setup_data_nodes(struct dentry *parent)

{

	struct setup_indirect *indirect;

	struct setup_data_node *node;

	struct setup_data *data;

	int error;

	u64 pa_data, pa_next;

	struct dentry *d;

	u64 pa_data;

	int error;

	u32 len;

	int no = 0;



	d = debugfs_create_dir("setup_data", parent);
@@ -112,12 +114,29 @@ static int __init create_setup_data_nodes(struct dentry *parent) 
			error = -ENOMEM;

			goto err_dir;

		}

		pa_next = data->next;



		if (data->type == SETUP_INDIRECT) {

			len = sizeof(*data) + data->len;

			memunmap(data);

			data = memremap(pa_data, len, MEMREMAP_WB);

			if (!data) {

				kfree(node);

				error = -ENOMEM;

				goto err_dir;

			}



		if (data->type == SETUP_INDIRECT &&

		    ((struct setup_indirect *)data->data)->type != SETUP_INDIRECT) {

			node->paddr = ((struct setup_indirect *)data->data)->addr;

			node->type  = ((struct setup_indirect *)data->data)->type;

			node->len   = ((struct setup_indirect *)data->data)->len;

			indirect = (struct setup_indirect *)data->data;



			if (indirect->type != SETUP_INDIRECT) {

				node->paddr = indirect->addr;

				node->type  = indirect->type;

				node->len   = indirect->len;

			} else {

				node->paddr = pa_data;

				node->type  = data->type;

				node->len   = data->len;

			}

		} else {

			node->paddr = pa_data;

			node->type  = data->type;
@@ -125,7 +144,7 @@ static int __init create_setup_data_nodes(struct dentry *parent) 
		}



		create_setup_data_node(d, no, node);

		pa_data = data->next;

		pa_data = pa_next;



		memunmap(data);

		no++;

arch/x86/kernel/ksysfs.c

+61 −16
Original line number Diff line number Diff line
@@ -91,26 +91,41 @@ static int get_setup_data_paddr(int nr, u64 *paddr) 


static int __init get_setup_data_size(int nr, size_t *size)

{

	int i = 0;

	u64 pa_data = boot_params.hdr.setup_data, pa_next;

	struct setup_indirect *indirect;

	struct setup_data *data;

	u64 pa_data = boot_params.hdr.setup_data;

	int i = 0;

	u32 len;



	while (pa_data) {

		data = memremap(pa_data, sizeof(*data), MEMREMAP_WB);

		if (!data)

			return -ENOMEM;

		pa_next = data->next;



		if (nr == i) {

			if (data->type == SETUP_INDIRECT &&

			    ((struct setup_indirect *)data->data)->type != SETUP_INDIRECT)

				*size = ((struct setup_indirect *)data->data)->len;

			if (data->type == SETUP_INDIRECT) {

				len = sizeof(*data) + data->len;

				memunmap(data);

				data = memremap(pa_data, len, MEMREMAP_WB);

				if (!data)

					return -ENOMEM;



				indirect = (struct setup_indirect *)data->data;



				if (indirect->type != SETUP_INDIRECT)

					*size = indirect->len;

				else

					*size = data->len;

			} else {

				*size = data->len;

			}



			memunmap(data);

			return 0;

		}



		pa_data = data->next;

		pa_data = pa_next;

		memunmap(data);

		i++;

	}
@@ -120,9 +135,11 @@ static int __init get_setup_data_size(int nr, size_t *size) 
static ssize_t type_show(struct kobject *kobj,

			 struct kobj_attribute *attr, char *buf)

{

	struct setup_indirect *indirect;

	struct setup_data *data;

	int nr, ret;

	u64 paddr;

	struct setup_data *data;

	u32 len;



	ret = kobj_to_setup_data_nr(kobj, &nr);

	if (ret)
@@ -135,10 +152,20 @@ static ssize_t type_show(struct kobject *kobj, 
	if (!data)

		return -ENOMEM;



	if (data->type == SETUP_INDIRECT)

		ret = sprintf(buf, "0x%x\n", ((struct setup_indirect *)data->data)->type);

	else

	if (data->type == SETUP_INDIRECT) {

		len = sizeof(*data) + data->len;

		memunmap(data);

		data = memremap(paddr, len, MEMREMAP_WB);

		if (!data)

			return -ENOMEM;



		indirect = (struct setup_indirect *)data->data;



		ret = sprintf(buf, "0x%x\n", indirect->type);

	} else {

		ret = sprintf(buf, "0x%x\n", data->type);

	}



	memunmap(data);

	return ret;

}
@@ -149,9 +176,10 @@ static ssize_t setup_data_data_read(struct file *fp, 
				    char *buf,

				    loff_t off, size_t count)

{

	struct setup_indirect *indirect;

	struct setup_data *data;

	int nr, ret = 0;

	u64 paddr, len;

	struct setup_data *data;

	void *p;



	ret = kobj_to_setup_data_nr(kobj, &nr);
@@ -165,10 +193,27 @@ static ssize_t setup_data_data_read(struct file *fp, 
	if (!data)

		return -ENOMEM;



	if (data->type == SETUP_INDIRECT &&

	    ((struct setup_indirect *)data->data)->type != SETUP_INDIRECT) {

		paddr = ((struct setup_indirect *)data->data)->addr;

		len = ((struct setup_indirect *)data->data)->len;

	if (data->type == SETUP_INDIRECT) {

		len = sizeof(*data) + data->len;

		memunmap(data);

		data = memremap(paddr, len, MEMREMAP_WB);

		if (!data)

			return -ENOMEM;



		indirect = (struct setup_indirect *)data->data;



		if (indirect->type != SETUP_INDIRECT) {

			paddr = indirect->addr;

			len = indirect->len;

		} else {

			/*

			 * Even though this is technically undefined, return

			 * the data as though it is a normal setup_data struct.

			 * This will at least allow it to be inspected.

			 */

			paddr += sizeof(*data);

			len = data->len;

		}

	} else {

		paddr += sizeof(*data);

		len = data->len;

arch/x86/kernel/module.c

+8 −5
Original line number Diff line number Diff line
@@ -273,6 +273,14 @@ int module_finalize(const Elf_Ehdr *hdr, 
			retpolines = s;

	}



	/*

	 * See alternative_instructions() for the ordering rules between the

	 * various patching types.

	 */

	if (para) {

		void *pseg = (void *)para->sh_addr;

		apply_paravirt(pseg, pseg + para->sh_size);

	}

	if (retpolines) {

		void *rseg = (void *)retpolines->sh_addr;

		apply_retpolines(rseg, rseg + retpolines->sh_size);
@@ -290,11 +298,6 @@ int module_finalize(const Elf_Ehdr *hdr, 
					    tseg, tseg + text->sh_size);

	}



	if (para) {

		void *pseg = (void *)para->sh_addr;

		apply_paravirt(pseg, pseg + para->sh_size);

	}



	/* make jump label nops */

	jump_label_apply_nops(me);