Merge pull request #2661 from coreosbot/master-4.12.3

Upgrade Linux in master to 4.12.3

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest

@@ -1,2 +1,2 @@
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
-DIST patch-4.12.2.xz 14660 SHA256 8447d28c88834bac75653a0370a6f30615688db4756b953720e9b024537e34ac SHA512 3d3e7cea82b20ba841d74f6f63e635143a52ee1428017792aa210ee591fcccf7ee1475c1576257722f0f5891547b69a192d48723ab6f4c189841e17ed8013300 WHIRLPOOL aa231e904ac23186cc1fcf380cbef9ee5d1e877af7a79003ad14fbb409ff2c3aa8a4613b7f9d87ae958283d3ed4009983e6cfca71177787fce24c39c80332508
+DIST patch-4.12.3.xz 39028 SHA256 13ad942e5144acafb849942c320aa6ab887cd2ffbba033c622f7a88eb2c32143 SHA512 a6ace68b6387665a1f77420b415a72032465fae6d99ec409487765ecf7cfb8a8458fe09f844662249f14e5739db3f82b28cdac705b0d54d4c6e268719d350c0d WHIRLPOOL 22f55a9609c444f5ef287076122075ea47a5382f30cb080146198430c98d9216d5ff5ddb4d2002988a00a832870e0fe961b38cc24034e984b031ce2064cfdf95

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0001-efi-Add-EFI_SECURE_BOOT-bit.patch

@@ -1,4 +1,4 @@
-From cfa603453e1ce4a90b4181a770fc17967e93d092 Mon Sep 17 00:00:00 2001
+From 5d06f19096c5f51365b1f51de408a584f92e57cc Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Mon, 21 Nov 2016 23:55:55 +0000
 Subject: [PATCH 01/25] efi: Add EFI_SECURE_BOOT bit
@@ -18,7 +18,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 36646f19d40b..87ef54e64842 100644
+index 36646f1..87ef54e 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -1190,6 +1190,7 @@ void __init setup_arch(char **cmdline_p)
@@ -30,7 +30,7 @@ index 36646f19d40b..87ef54e64842 100644
  			break;
  		default:
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index ec36f42a2add..381b3f6670d3 100644
+index ec36f42..381b3f6 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
 @@ -1069,6 +1069,7 @@ extern int __init efi_setup_pcdp_console(char *);
@@ -42,5 +42,5 @@ index ec36f42a2add..381b3f6670d3 100644
  #ifdef CONFIG_EFI
  /*
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0002-Add-the-ability-to-lock-down-access-to-the-running-k.patch

@@ -1,4 +1,4 @@
-From 835ca0ffa0228cacbec3e2d17864053302bb0479 Mon Sep 17 00:00:00 2001
+From e6f64a69118565e024b275ed1d9e6775ef58c503 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Mon, 21 Nov 2016 23:36:17 +0000
 Subject: [PATCH 02/25] Add the ability to lock down access to the running
@@ -21,7 +21,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  create mode 100644 security/lock_down.c
 
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 13bc08aba704..282a1684d6e8 100644
+index 13bc08a..282a168 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
 @@ -276,6 +276,15 @@ extern int oops_may_print(void);
@@ -41,7 +41,7 @@ index 13bc08aba704..282a1684d6e8 100644
  int __must_check _kstrtoul(const char *s, unsigned int base, unsigned long *res);
  int __must_check _kstrtol(const char *s, unsigned int base, long *res);
 diff --git a/include/linux/security.h b/include/linux/security.h
-index af675b576645..68bab18ddd57 100644
+index af675b5..68bab18 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
 @@ -1698,5 +1698,16 @@ static inline void free_secdata(void *secdata)
@@ -62,7 +62,7 @@ index af675b576645..68bab18ddd57 100644
  #endif /* ! __LINUX_SECURITY_H */
  
 diff --git a/security/Kconfig b/security/Kconfig
-index 93027fdf47d1..4baac4aab277 100644
+index 93027fd..4baac4a 100644
 --- a/security/Kconfig
 +++ b/security/Kconfig
 @@ -189,6 +189,21 @@ config STATIC_USERMODEHELPER_PATH
@@ -88,7 +88,7 @@ index 93027fdf47d1..4baac4aab277 100644
  source security/smack/Kconfig
  source security/tomoyo/Kconfig
 diff --git a/security/Makefile b/security/Makefile
-index f2d71cdb8e19..8c4a43e3d4e0 100644
+index f2d71cd..8c4a43e 100644
 --- a/security/Makefile
 +++ b/security/Makefile
 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE)		+= device_cgroup.o
@@ -100,7 +100,7 @@ index f2d71cdb8e19..8c4a43e3d4e0 100644
 +obj-$(CONFIG_LOCK_DOWN_KERNEL)		+= lock_down.o
 diff --git a/security/lock_down.c b/security/lock_down.c
 new file mode 100644
-index 000000000000..5788c60ff4e1
+index 0000000..5788c60
 --- /dev/null
 +++ b/security/lock_down.c
 @@ -0,0 +1,40 @@
@@ -145,5 +145,5 @@ index 000000000000..5788c60ff4e1
 +}
 +EXPORT_SYMBOL(kernel_is_locked_down);
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0003-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch

@@ -1,4 +1,4 @@
-From 44a561a24da72b39d2df450f9a3da7c3682d1fe5 Mon Sep 17 00:00:00 2001
+From bcf0fd7548cecd0dc3c78402b6238f50b2fd98d1 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Mon, 21 Nov 2016 23:55:55 +0000
 Subject: [PATCH 03/25] efi: Lock down the kernel if booted in secure boot mode
@@ -16,7 +16,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 0efb4c9497bc..4d1c53bb8411 100644
+index 0efb4c9..4d1c53b 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
 @@ -1827,6 +1827,18 @@ config EFI_MIXED
@@ -39,7 +39,7 @@ index 0efb4c9497bc..4d1c53bb8411 100644
  	def_bool y
  	prompt "Enable seccomp to safely compute untrusted bytecode"
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 87ef54e64842..4c4d758d4be1 100644
+index 87ef54e..4c4d758 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -69,6 +69,7 @@
@@ -65,5 +65,5 @@ index 87ef54e64842..4c4d758d4be1 100644
  		default:
  			pr_info("Secure boot could not be determined\n");
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0004-Enforce-module-signatures-if-the-kernel-is-locked-do.patch

@@ -1,4 +1,4 @@
-From 2e096fd974c29912c84c44565f2f1cf255f15f03 Mon Sep 17 00:00:00 2001
+From d0837577b797e57373f78b634f5b9a3e7852a232 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Wed, 23 Nov 2016 13:22:22 +0000
 Subject: [PATCH 04/25] Enforce module signatures if the kernel is locked down
@@ -12,7 +12,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/kernel/module.c b/kernel/module.c
-index 4a3665f8f837..3f1de34c6d10 100644
+index 4a3665f..3f1de34 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -2777,7 +2777,7 @@ static int module_sig_check(struct load_info *info, int flags)
@@ -25,5 +25,5 @@ index 4a3665f8f837..3f1de34c6d10 100644
  
  	return err;
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0005-Restrict-dev-mem-and-dev-kmem-when-the-kernel-is-loc.patch

@@ -1,4 +1,4 @@
-From bd187bcfb3d9f9637da68c3751c75a72316aa9b9 Mon Sep 17 00:00:00 2001
+From dc109b02e160750393cc042882ff622620941ef6 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Tue, 22 Nov 2016 08:46:16 +0000
 Subject: [PATCH 05/25] Restrict /dev/mem and /dev/kmem when the kernel is
@@ -15,7 +15,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 593a8818aca9..ba68add9677f 100644
+index 593a881..ba68add 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -179,6 +179,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
@@ -39,5 +39,5 @@ index 593a8818aca9..ba68add9677f 100644
  		unsigned long to_write = min_t(unsigned long, count,
  					       (unsigned long)high_memory - p);
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0006-kexec-Disable-at-runtime-if-the-kernel-is-locked-dow.patch

@@ -1,4 +1,4 @@
-From b02f53821c4ac3f070ffa5bcad5462f9dc39fff5 Mon Sep 17 00:00:00 2001
+From df2d85f3b0b91569e14f21ccb0c444c1dd0b96a6 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Tue, 22 Nov 2016 08:46:15 +0000
 Subject: [PATCH 06/25] kexec: Disable at runtime if the kernel is locked down
@@ -17,7 +17,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 980936a90ee6..46de8e6b42f4 100644
+index 980936a..46de8e6 100644
 --- a/kernel/kexec.c
 +++ b/kernel/kexec.c
 @@ -194,6 +194,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
@@ -35,5 +35,5 @@ index 980936a90ee6..46de8e6b42f4 100644
  	 * This leaves us room for future extensions.
  	 */
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0007-Copy-secure_boot-flag-in-boot-params-across-kexec-re.patch

@@ -1,4 +1,4 @@
-From a2d0b5ce698aea2d9c9365e8a0e1950ccfca04c9 Mon Sep 17 00:00:00 2001
+From 9b8ca8f7013bcd0015ca2cf6cb72497f063983e7 Mon Sep 17 00:00:00 2001
 From: Dave Young <dyoung@redhat.com>
 Date: Tue, 22 Nov 2016 08:46:15 +0000
 Subject: [PATCH 07/25] Copy secure_boot flag in boot params across kexec
@@ -22,7 +22,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
-index 9d7fd5e6689a..7e6f00ae8322 100644
+index 9d7fd5e..7e6f00a 100644
 --- a/arch/x86/kernel/kexec-bzimage64.c
 +++ b/arch/x86/kernel/kexec-bzimage64.c
 @@ -179,6 +179,7 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
@@ -34,5 +34,5 @@ index 9d7fd5e6689a..7e6f00ae8322 100644
  	ei->efi_systab = current_ei->efi_systab;
  	ei->efi_systab_hi = current_ei->efi_systab_hi;
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0008-kexec_file-Disable-at-runtime-if-securelevel-has-bee.patch

@@ -1,4 +1,4 @@
-From fd75640cbb9761818b21f658aa63585dd3b51924 Mon Sep 17 00:00:00 2001
+From 65c7f9c24804325e8c64b0d79a3e9344fba64ca8 Mon Sep 17 00:00:00 2001
 From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com>
 Date: Wed, 23 Nov 2016 13:49:19 +0000
 Subject: [PATCH 08/25] kexec_file: Disable at runtime if securelevel has been
@@ -18,7 +18,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
-index b118735fea9d..f6937eecd1eb 100644
+index b118735..f6937ee 100644
 --- a/kernel/kexec_file.c
 +++ b/kernel/kexec_file.c
 @@ -268,6 +268,12 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd,
@@ -35,5 +35,5 @@ index b118735fea9d..f6937eecd1eb 100644
  	if (flags != (flags & KEXEC_FILE_FLAGS))
  		return -EINVAL;
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0009-hibernate-Disable-when-the-kernel-is-locked-down.patch

@@ -1,4 +1,4 @@
-From 009afd2bd0dfa1e5c0ee2165ffbdba019a43ef99 Mon Sep 17 00:00:00 2001
+From bf3f6dabab017df210355ab11b6522e08aad8b38 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Tue, 22 Nov 2016 08:46:15 +0000
 Subject: [PATCH 09/25] hibernate: Disable when the kernel is locked down
@@ -15,7 +15,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index a8b978c35a6a..50cca5dcb62f 100644
+index a8b978c..50cca5d 100644
 --- a/kernel/power/hibernate.c
 +++ b/kernel/power/hibernate.c
 @@ -70,7 +70,7 @@ static const struct platform_hibernation_ops *hibernation_ops;
@@ -28,5 +28,5 @@ index a8b978c35a6a..50cca5dcb62f 100644
  
  /**
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0010-uswsusp-Disable-when-the-kernel-is-locked-down.patch

@@ -1,4 +1,4 @@
-From 6355e8dee4bbee901afa9f602ed436b960d79441 Mon Sep 17 00:00:00 2001
+From 3eec411173fce08deee532638d9c229b5b03b76e Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@srcf.ucam.org>
 Date: Wed, 23 Nov 2016 13:28:17 +0000
 Subject: [PATCH 10/25] uswsusp: Disable when the kernel is locked down
@@ -14,7 +14,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/kernel/power/user.c b/kernel/power/user.c
-index 22df9f7ff672..e4b926d329b7 100644
+index 22df9f7..e4b926d 100644
 --- a/kernel/power/user.c
 +++ b/kernel/power/user.c
 @@ -52,6 +52,9 @@ static int snapshot_open(struct inode *inode, struct file *filp)
@@ -28,5 +28,5 @@ index 22df9f7ff672..e4b926d329b7 100644
  
  	if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0011-PCI-Lock-down-BAR-access-when-the-kernel-is-locked-d.patch

@@ -1,4 +1,4 @@
-From dfff658afb99aaa528052d384d33e5f365cc730c Mon Sep 17 00:00:00 2001
+From 4a2f6e5e4791719317b13fd99377626a522e41ba Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Tue, 22 Nov 2016 08:46:15 +0000
 Subject: [PATCH 11/25] PCI: Lock down BAR access when the kernel is locked
@@ -19,7 +19,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  3 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index 31e99613a12e..559556047d66 100644
+index 31e9961..5595560 100644
 --- a/drivers/pci/pci-sysfs.c
 +++ b/drivers/pci/pci-sysfs.c
 @@ -754,6 +754,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
@@ -53,7 +53,7 @@ index 31e99613a12e..559556047d66 100644
  }
  
 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index 098360d7ff81..ef16fccb1923 100644
+index 098360d..ef16fcc 100644
 --- a/drivers/pci/proc.c
 +++ b/drivers/pci/proc.c
 @@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
@@ -86,7 +86,7 @@ index 098360d7ff81..ef16fccb1923 100644
  
  	if (fpriv->mmap_state == pci_mmap_io) {
 diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
-index 9bf993e1f71e..c09524738ceb 100644
+index 9bf993e..c095247 100644
 --- a/drivers/pci/syscall.c
 +++ b/drivers/pci/syscall.c
 @@ -92,7 +92,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
@@ -99,5 +99,5 @@ index 9bf993e1f71e..c09524738ceb 100644
  
  	dev = pci_get_bus_and_slot(bus, dfn);
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0012-x86-Lock-down-IO-port-access-when-the-kernel-is-lock.patch

@@ -1,4 +1,4 @@
-From 5071401ad122ff7f04f909b5871f57385bf96573 Mon Sep 17 00:00:00 2001
+From 53df2265b3cd221a519ee91b843021762363210d Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Tue, 22 Nov 2016 08:46:16 +0000
 Subject: [PATCH 12/25] x86: Lock down IO port access when the kernel is locked
@@ -20,7 +20,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 9c3cf0944bce..4a613fed94b6 100644
+index 9c3cf09..4a613fe 100644
 --- a/arch/x86/kernel/ioport.c
 +++ b/arch/x86/kernel/ioport.c
 @@ -30,7 +30,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
@@ -42,7 +42,7 @@ index 9c3cf0944bce..4a613fed94b6 100644
  	}
  	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) |
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index ba68add9677f..5e2a260fb89f 100644
+index ba68add..5e2a260 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -768,6 +768,8 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
@@ -55,5 +55,5 @@ index ba68add9677f..5e2a260fb89f 100644
  }
  
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0013-x86-Restrict-MSR-access-when-the-kernel-is-locked-do.patch

@@ -1,4 +1,4 @@
-From 3acbbd38964877431c984d86896bd5e105312e8e Mon Sep 17 00:00:00 2001
+From 52bf4a02f1adb42399c3110ddcbbe64e4e21a00b Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Tue, 22 Nov 2016 08:46:17 +0000
 Subject: [PATCH 13/25] x86: Restrict MSR access when the kernel is locked down
@@ -15,7 +15,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
-index ef688804f80d..fbcce028e502 100644
+index ef68880..fbcce02 100644
 --- a/arch/x86/kernel/msr.c
 +++ b/arch/x86/kernel/msr.c
 @@ -84,6 +84,9 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
@@ -40,5 +40,5 @@ index ef688804f80d..fbcce028e502 100644
  			err = -EFAULT;
  			break;
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0014-asus-wmi-Restrict-debugfs-interface-when-the-kernel-.patch

@@ -1,4 +1,4 @@
-From ccd15a16715ea1984f5800f8e3587b394f394837 Mon Sep 17 00:00:00 2001
+From 96e01270c809608206a4647607ede4363a358fb7 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Tue, 22 Nov 2016 08:46:16 +0000
 Subject: [PATCH 14/25] asus-wmi: Restrict debugfs interface when the kernel is
@@ -17,7 +17,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index 6c7d86074b38..57b82cbc9a6b 100644
+index 6c7d860..57b82cb 100644
 --- a/drivers/platform/x86/asus-wmi.c
 +++ b/drivers/platform/x86/asus-wmi.c
 @@ -1905,6 +1905,9 @@ static int show_dsts(struct seq_file *m, void *data)
@@ -51,5 +51,5 @@ index 6c7d86074b38..57b82cbc9a6b 100644
  				     1, asus->debug.method_id,
  				     &input, &output);
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0015-ACPI-Limit-access-to-custom_method-when-the-kernel-i.patch

@@ -1,4 +1,4 @@
-From 764be416d67e5b5975fa1c06318db42cabe2d2bf Mon Sep 17 00:00:00 2001
+From 9f4d3e5e9ce38e4a119ef709e46e03952914c168 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Tue, 22 Nov 2016 08:46:16 +0000
 Subject: [PATCH 15/25] ACPI: Limit access to custom_method when the kernel is
@@ -15,7 +15,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
-index c68e72414a67..e4d721c330c0 100644
+index c68e724..e4d721c 100644
 --- a/drivers/acpi/custom_method.c
 +++ b/drivers/acpi/custom_method.c
 @@ -29,6 +29,9 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
@@ -29,5 +29,5 @@ index c68e72414a67..e4d721c330c0 100644
  		/* parse the table header to get the table length */
  		if (count <= sizeof(struct acpi_table_header))
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0016-acpi-Ignore-acpi_rsdp-kernel-param-when-the-kernel-h.patch

@@ -1,4 +1,4 @@
-From 673433370151b244c7c092485c69f55a67044ebd Mon Sep 17 00:00:00 2001
+From 6a2dc082f6443bb00dcae4cd35950d998e14249c Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Tue, 22 Nov 2016 08:46:16 +0000
 Subject: [PATCH 16/25] acpi: Ignore acpi_rsdp kernel param when the kernel has
@@ -15,7 +15,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index db78d353bab1..d4d4ba348451 100644
+index db78d35..d4d4ba3 100644
 --- a/drivers/acpi/osl.c
 +++ b/drivers/acpi/osl.c
 @@ -192,7 +192,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
@@ -28,5 +28,5 @@ index db78d353bab1..d4d4ba348451 100644
  #endif
  
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0017-acpi-Disable-ACPI-table-override-if-the-kernel-is-lo.patch

@@ -1,4 +1,4 @@
-From 19585059101a2626d79718a56001c3340a40ccf9 Mon Sep 17 00:00:00 2001
+From b3bfbcc6a208ea30f2964afb89417d930a00f179 Mon Sep 17 00:00:00 2001
 From: Linn Crosetto <linn@hpe.com>
 Date: Wed, 23 Nov 2016 13:32:27 +0000
 Subject: [PATCH 17/25] acpi: Disable ACPI table override if the kernel is
@@ -21,7 +21,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
-index ff425390bfa8..c72bfa97888a 100644
+index ff42539..c72bfa9 100644
 --- a/drivers/acpi/tables.c
 +++ b/drivers/acpi/tables.c
 @@ -526,6 +526,11 @@ void __init acpi_table_upgrade(void)
@@ -37,5 +37,5 @@ index ff425390bfa8..c72bfa97888a 100644
  		memblock_find_in_range(0, ACPI_TABLE_UPGRADE_MAX_PHYS,
  				       all_tables_size, PAGE_SIZE);
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0018-acpi-Disable-APEI-error-injection-if-the-kernel-is-l.patch

@@ -1,4 +1,4 @@
-From 812d81fcbf27458892c9a661b65e005caa600a77 Mon Sep 17 00:00:00 2001
+From 5c175cceea2513f21c241afb974cdf142174a81e Mon Sep 17 00:00:00 2001
 From: Linn Crosetto <linn@hpe.com>
 Date: Wed, 23 Nov 2016 13:39:41 +0000
 Subject: [PATCH 18/25] acpi: Disable APEI error injection if the kernel is
@@ -26,7 +26,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
-index ec50c32ea3da..e082718d01c2 100644
+index ec50c32..e082718 100644
 --- a/drivers/acpi/apei/einj.c
 +++ b/drivers/acpi/apei/einj.c
 @@ -518,6 +518,9 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
@@ -40,5 +40,5 @@ index ec50c32ea3da..e082718d01c2 100644
  	if (flags && (flags &
  		~(SETWA_FLAGS_APICID|SETWA_FLAGS_MEM|SETWA_FLAGS_PCIE_SBDF)))
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0019-bpf-Restrict-kernel-image-access-functions-when-the-.patch

@@ -1,4 +1,4 @@
-From 92bd5fbe1085fe4d179391ffd2a51edc3cb08dd2 Mon Sep 17 00:00:00 2001
+From 802c4ee62ad250c77eef040fb8704fccf1cb7b05 Mon Sep 17 00:00:00 2001
 From: "Lee, Chun-Yi" <jlee@suse.com>
 Date: Wed, 23 Nov 2016 13:52:16 +0000
 Subject: [PATCH 19/25] bpf: Restrict kernel image access functions when the
@@ -17,7 +17,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 11 insertions(+)
 
 diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
-index 460a031c77e5..58eb33d5d6ae 100644
+index 460a031..58eb33d 100644
 --- a/kernel/trace/bpf_trace.c
 +++ b/kernel/trace/bpf_trace.c
 @@ -65,6 +65,11 @@ BPF_CALL_3(bpf_probe_read, void *, dst, u32, size, const void *, unsafe_ptr)
@@ -53,5 +53,5 @@ index 460a031c77e5..58eb33d5d6ae 100644
  	for (i = 0; i < fmt_size; i++) {
  		if ((!isprint(fmt[i]) && !isspace(fmt[i])) || !isascii(fmt[i]))
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0020-scsi-Lock-down-the-eata-driver.patch

@@ -1,4 +1,4 @@
-From 98b52d715b3deac17438877d0a98d5b579d5c77e Mon Sep 17 00:00:00 2001
+From dbccf331f956823c1ebc082200b0596c0e535f77 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 22 Nov 2016 10:10:34 +0000
 Subject: [PATCH 20/25] scsi: Lock down the eata driver
@@ -24,7 +24,7 @@ cc: linux-scsi@vger.kernel.org
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
-index 227dd2c2ec2f..5c036d10c18b 100644
+index 227dd2c..5c036d1 100644
 --- a/drivers/scsi/eata.c
 +++ b/drivers/scsi/eata.c
 @@ -1552,8 +1552,13 @@ static int eata2x_detect(struct scsi_host_template *tpnt)
@@ -43,5 +43,5 @@ index 227dd2c2ec2f..5c036d10c18b 100644
  #if defined(MODULE)
  	/* io_port could have been modified when loading as a module */
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0021-Prohibit-PCMCIA-CIS-storage-when-the-kernel-is-locke.patch

@@ -1,4 +1,4 @@
-From 57d71dbd2cc6c719fc01a697b7369d0594d9d28a Mon Sep 17 00:00:00 2001
+From c41923cb22c64f7c4fa04f137b183bc5cb4aa7fe Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 25 Nov 2016 14:37:45 +0000
 Subject: [PATCH 21/25] Prohibit PCMCIA CIS storage when the kernel is locked
@@ -13,7 +13,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
-index 55ef7d1fd8da..193e4f7b73b1 100644
+index 55ef7d1..193e4f7 100644
 --- a/drivers/pcmcia/cistpl.c
 +++ b/drivers/pcmcia/cistpl.c
 @@ -1578,6 +1578,11 @@ static ssize_t pccard_store_cis(struct file *filp, struct kobject *kobj,
@@ -29,5 +29,5 @@ index 55ef7d1fd8da..193e4f7b73b1 100644
  
  	if (off)
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0022-Lock-down-TIOCSSERIAL.patch

@@ -1,4 +1,4 @@
-From bbf9b9edd8e7eff5610cfa16b4e67281337fbf70 Mon Sep 17 00:00:00 2001
+From 3e584605a23caa6293acaddbad36d566508cc4f0 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Wed, 7 Dec 2016 10:28:39 +0000
 Subject: [PATCH 22/25] Lock down TIOCSSERIAL
@@ -15,7 +15,7 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
-index 13bfd5dcffce..45fb7689bc1c 100644
+index 13bfd5d..45fb768 100644
 --- a/drivers/tty/serial/serial_core.c
 +++ b/drivers/tty/serial/serial_core.c
 @@ -821,6 +821,12 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
@@ -32,5 +32,5 @@ index 13bfd5dcffce..45fb7689bc1c 100644
  		retval = -EPERM;
  		if (change_irq || change_port ||
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0023-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch

@@ -1,4 +1,4 @@
-From 3b495dca8e50681b45c93aa8c8e5ca7b670aa530 Mon Sep 17 00:00:00 2001
+From dfb8606c4c7fed0cbc2434e79b2a09dbe602887f Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
 Subject: [PATCH 23/25] kbuild: derive relative path for KBUILD_SRC from CURDIR
@@ -12,7 +12,7 @@ by some undesirable path component.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 7c81bbba2943..3a0b09071efa 100644
+index f5bbee4..8ad0fb0 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -149,7 +149,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
@@ -26,5 +26,5 @@ index 7c81bbba2943..3a0b09071efa 100644
  
  # Leave processing to above invocation of make
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0024-Add-arm64-coreos-verity-hash.patch

@@ -1,4 +1,4 @@
-From 5fe5056f8dad60719469b61ae41db16e7fb0e9a5 Mon Sep 17 00:00:00 2001
+From f18af56f250933617aeae9cc2b5aeae22e2803c4 Mon Sep 17 00:00:00 2001
 From: Geoff Levand <geoff@infradead.org>
 Date: Fri, 11 Nov 2016 17:28:52 -0800
 Subject: [PATCH 24/25] Add arm64 coreos verity hash
@@ -9,7 +9,7 @@ Signed-off-by: Geoff Levand <geoff@infradead.org>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm64/kernel/efi-header.S b/arch/arm64/kernel/efi-header.S
-index 613fc3000677..fdaf86c78332 100644
+index 613fc30..fdaf86c 100644
 --- a/arch/arm64/kernel/efi-header.S
 +++ b/arch/arm64/kernel/efi-header.S
 @@ -103,6 +103,11 @@ section_table:
@@ -25,5 +25,5 @@ index 613fc3000677..fdaf86c78332 100644
  	/*
  	 * The debug table is referenced via its Relative Virtual Address (RVA),
 -- 
-2.13.0
+2.10.2
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.12/z0025-vmbus-re-enable-channel-tasklet.patch

@@ -1,4 +1,4 @@
-From 91e148c7e146b7cdd53e0c0ede953c9fa90c110a Mon Sep 17 00:00:00 2001
+From 7102e64dd2611bdea3782f99ef2ebc4a39d7e657 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen@networkplumber.org>
 Date: Sun, 25 Jun 2017 12:47:46 -0700
 Subject: [PATCH 25/25] vmbus: re-enable channel tasklet
@@ -23,7 +23,7 @@ Cc: stable@vger.kernel.org
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
-index 736ac76d2a6a..3cea1216754e 100644
+index 736ac76..3cea121 100644
 --- a/drivers/hv/channel.c
 +++ b/drivers/hv/channel.c
 @@ -606,6 +606,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
@@ -36,5 +36,5 @@ index 736ac76d2a6a..3cea1216754e 100644
  }
  
 -- 
-2.13.0
+2.10.2