From f692dd08ca6d01a132757ed9e65a044cc2aeff0d Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 18 Mar 2015 09:19:16 -0400 Subject: [PATCH] Refresh patches from git tree --- ARM-tegra-usb-no-reset.patch | 4 ++-- Add-EFI-signature-data-types.patch | 6 +++--- ...FI-signature-blob-parser-and-key-loader.patch | 4 ++-- ...-automatically-enforce-module-signature.patch | 16 ++++++++-------- Add-secure_modules-call.patch | 10 +++++----- ...ysrq-option-to-disable-secure-boot-mode.patch | 2 +- ...3k-Add-support-Atheros-AR5B195-combo-Mi.patch | 6 +++--- HID-multitouch-add-support-of-clickpads.patch | 8 ++++---- ...nt-integer-overflow-in-ib_umem_get-addr.patch | 4 ++-- KEYS-Add-a-system-blacklist-keyring.patch | 4 ++-- Kbuild-Add-an-option-to-enable-GCC-VTA.patch | 6 +++--- ...port-certificates-from-UEFI-Secure-Boot.patch | 12 ++++++------ ...-BAR-access-when-module-security-is-ena.patch | 8 ++++---- ...mem-and-dev-kmem-when-module-loading-is.patch | 6 +++--- ...-ACPI-video-change-acpi-video-brightnes.patch | 6 +++--- ...cpi_rsdp-kernel-parameter-when-module-l.patch | 2 +- ...ts-am335x-boneblack-add-cpu0-opp-points.patch | 2 +- ...ts-am335x-boneblack-lcdc-add-panel-info.patch | 5 +++-- ...rict-debugfs-interface-when-module-load.patch | 8 ++++---- crash-driver.patch | 6 +++--- criu-no-expert.patch | 6 +++--- disable-i8042-check-on-apple-mac.patch | 6 +++--- drm-i915-hush-check-crtc-state.patch | 2 +- drm-i915-tame-the-chattermouth-v2.patch | 8 ++++---- efi-Add-EFI_SECURE_BOOT-bit.patch | 8 ++++---- ...secure-boot-if-shim-is-in-insecure-mode.patch | 2 +- ...I_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch | 4 ++-- ext4-Allocate-entire-range-in-zero-range.patch | 6 +++--- input-kill-stupid-messages.patch | 2 +- input-silence-i8042-noise.patch | 6 +++--- ...-at-runtime-if-the-kernel-enforces-modu.patch | 2 +- no-pcspkr-modalias.patch | 2 +- ...inctrl-single-must-be-initialized-early.patch | 4 ++-- ..._revalidate_disk-prevent-NULL-ptr-deref.patch | 4 ++-- vhost-scsi-potential-memory-corruption.patch | 6 +++--- ...-IO-port-access-when-module-security-is.patch | 4 ++-- ...MSR-access-when-module-loading-is-restr.patch | 6 +++--- 37 files changed, 102 insertions(+), 101 deletions(-) diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch index e8a4b580c..2a02021d1 100644 --- a/ARM-tegra-usb-no-reset.patch +++ b/ARM-tegra-usb-no-reset.patch @@ -9,10 +9,10 @@ Patch for disconnect issues with storage attached to a 1 file changed, 7 insertions(+) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 2246954d7df3..dbd69b7eae92 100644 +index b4bfa3ac4b12..1753af78b2b2 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5023,6 +5023,13 @@ static void hub_event(struct work_struct *work) +@@ -5021,6 +5021,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); diff --git a/Add-EFI-signature-data-types.patch b/Add-EFI-signature-data-types.patch index 8a9a9f5fb..c19381982 100644 --- a/Add-EFI-signature-data-types.patch +++ b/Add-EFI-signature-data-types.patch @@ -14,10 +14,10 @@ Signed-off-by: David Howells 1 file changed, 20 insertions(+) diff --git a/include/linux/efi.h b/include/linux/efi.h -index 130ba866a24a..58d7feadd149 100644 +index 16ec1c00919d..b7cb7dc5ebb4 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -586,6 +586,12 @@ void efi_native_runtime_setup(void); +@@ -589,6 +589,12 @@ void efi_native_runtime_setup(void); #define DEVICE_TREE_GUID \ EFI_GUID( 0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 ) @@ -30,7 +30,7 @@ index 130ba866a24a..58d7feadd149 100644 typedef struct { efi_guid_t guid; u64 table; -@@ -801,6 +807,20 @@ typedef struct _efi_file_io_interface { +@@ -804,6 +810,20 @@ typedef struct _efi_file_io_interface { #define EFI_INVALID_TABLE_ADDR (~0UL) diff --git a/Add-an-EFI-signature-blob-parser-and-key-loader.patch b/Add-an-EFI-signature-blob-parser-and-key-loader.patch index 7c5c7e7cd..978a3fc72 100644 --- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch +++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch @@ -159,10 +159,10 @@ index 000000000000..424896a0b169 + return 0; +} diff --git a/include/linux/efi.h b/include/linux/efi.h -index 58d7feadd149..b1d686e9175e 100644 +index b7cb7dc5ebb4..fb972b96959a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -919,6 +919,10 @@ extern bool efi_poweroff_required(void); +@@ -923,6 +923,10 @@ extern bool efi_poweroff_required(void); char * __init efi_md_typeattr_format(char *buf, size_t size, const efi_memory_desc_t *md); diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch index 98073f00d..4b3671743 100644 --- a/Add-option-to-automatically-enforce-module-signature.patch +++ b/Add-option-to-automatically-enforce-module-signature.patch @@ -33,10 +33,10 @@ index 199f453cb4de..ec38acf00b40 100644 290/040 ALL edd_mbr_sig_buffer EDD MBR signatures 2D0/A00 ALL e820_map E820 memory map table diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 3635fff7b32d..39fc1cd142a1 100644 +index 0dc9d0144a27..58273956750d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1615,6 +1615,16 @@ config EFI_MIXED +@@ -1660,6 +1660,16 @@ config EFI_MIXED If unsure, say N. @@ -54,7 +54,7 @@ index 3635fff7b32d..39fc1cd142a1 100644 def_bool y prompt "Enable seccomp to safely compute untrusted bytecode" diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -index 1acf605a646d..6da2da7ac9c3 100644 +index 92b9a5f2aed6..2192da755e34 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -12,6 +12,7 @@ @@ -129,10 +129,10 @@ index 225b0988043a..90dbfb73e11f 100644 * The sentinel is set to a nonzero value (0xff) in header.S. * diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index ab08aa2276fb..f4eb99432db1 100644 +index ab4734e5411d..5d52d67d5097 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1150,6 +1150,12 @@ void __init setup_arch(char **cmdline_p) +@@ -1152,6 +1152,12 @@ void __init setup_arch(char **cmdline_p) io_delay_init(); @@ -146,7 +146,7 @@ index ab08aa2276fb..f4eb99432db1 100644 * Parse the ACPI tables for possible boot-time SMP configuration. */ diff --git a/include/linux/module.h b/include/linux/module.h -index 341a73ecea2e..cca08ac450e2 100644 +index d4b96d6c926a..c47f75720dbd 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add); @@ -163,10 +163,10 @@ index 341a73ecea2e..cca08ac450e2 100644 extern int modules_disabled; /* for sysctl */ diff --git a/kernel/module.c b/kernel/module.c -index 6507ffcb5445..cace4bd04956 100644 +index 98c3d7955a51..6244f24abe27 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3845,6 +3845,13 @@ void module_layout(struct module *mod, +@@ -3896,6 +3896,13 @@ void module_layout(struct module *mod, EXPORT_SYMBOL(module_layout); #endif diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch index d68a7e103..84ff314ac 100644 --- a/Add-secure_modules-call.patch +++ b/Add-secure_modules-call.patch @@ -16,10 +16,10 @@ Signed-off-by: Matthew Garrett 2 files changed, 17 insertions(+) diff --git a/include/linux/module.h b/include/linux/module.h -index 71f282a4e307..341a73ecea2e 100644 +index b653d7c0a05a..d4b96d6c926a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -516,6 +516,8 @@ int unregister_module_notifier(struct notifier_block *nb); +@@ -502,6 +502,8 @@ int unregister_module_notifier(struct notifier_block *nb); extern void print_modules(void); @@ -28,7 +28,7 @@ index 71f282a4e307..341a73ecea2e 100644 #else /* !CONFIG_MODULES... */ /* Given an address, look for it in the exception tables. */ -@@ -626,6 +628,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb) +@@ -612,6 +614,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb) static inline void print_modules(void) { } @@ -41,10 +41,10 @@ index 71f282a4e307..341a73ecea2e 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index 88cec1ddb1e3..6507ffcb5445 100644 +index d856e96a3cce..98c3d7955a51 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3844,3 +3844,13 @@ void module_layout(struct module *mod, +@@ -3895,3 +3895,13 @@ void module_layout(struct module *mod, } EXPORT_SYMBOL(module_layout); #endif diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index bbd41f249..67302f2a4 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -215,7 +215,7 @@ index 387fa7d05c98..4b07e30b3279 100644 int unregister_sysrq_key(int key, struct sysrq_key_op *op); struct sysrq_key_op *__sysrq_get_key_op(int key); diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c -index 7b40c5f07dce..8a60477b96e1 100644 +index 60f6bb817f70..c0a20ee0ad96 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -1968,7 +1968,7 @@ static int kdb_sr(int argc, const char **argv) diff --git a/Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch b/Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch index 38afde19d..82b55c028 100644 --- a/Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch +++ b/Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch @@ -43,7 +43,7 @@ Cc: stable@vger.kernel.org 2 files changed, 2 insertions(+) diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c -index 086240cd29c3..b2c68213696a 100644 +index de4c8499cbac..288547a3c566 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -65,6 +65,7 @@ static const struct usb_device_id ath3k_table[] = { @@ -55,10 +55,10 @@ index 086240cd29c3..b2c68213696a 100644 { USB_DEVICE(0x0CF3, 0x3002) }, { USB_DEVICE(0x0CF3, 0xE019) }, diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 091c813df8e9..79e344f9e681 100644 +index c91ec52a8948..b0449bb18873 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -142,6 +142,7 @@ static const struct usb_device_id blacklist_table[] = { +@@ -153,6 +153,7 @@ static const struct usb_device_id blacklist_table[] = { /* Atheros 3011 with sflash firmware */ { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE }, { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE }, diff --git a/HID-multitouch-add-support-of-clickpads.patch b/HID-multitouch-add-support-of-clickpads.patch index 97765c490..97edb7dd6 100644 --- a/HID-multitouch-add-support-of-clickpads.patch +++ b/HID-multitouch-add-support-of-clickpads.patch @@ -12,10 +12,10 @@ Tested-by: Jason Ekstrand 1 file changed, 9 insertions(+) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 51e25b9407f2..a8e738191625 100644 +index f65e78b46999..ef06dc30b9b1 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c -@@ -115,6 +115,7 @@ struct mt_device { +@@ -116,6 +116,7 @@ struct mt_device { __u8 touches_by_report; /* how many touches are present in one report: * 1 means we should use a serial protocol * > 1 means hybrid (multitouch) protocol */ @@ -23,7 +23,7 @@ index 51e25b9407f2..a8e738191625 100644 bool serial_maybe; /* need to check for serial protocol */ bool curvalid; /* is the current contact valid? */ unsigned mt_flags; /* flags to pass to input-mt */ -@@ -372,6 +373,10 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, +@@ -379,6 +380,10 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, td->inputmode_value = MT_INPUTMODE_TOUCHPAD; } @@ -34,7 +34,7 @@ index 51e25b9407f2..a8e738191625 100644 if (usage->usage_index) prev_usage = &field->usage[usage->usage_index - 1]; -@@ -721,6 +726,10 @@ static void mt_touch_input_configured(struct hid_device *hdev, +@@ -728,6 +733,10 @@ static void mt_touch_input_configured(struct hid_device *hdev, if (cls->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP) td->mt_flags |= INPUT_MT_DROP_UNUSED; diff --git a/IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch b/IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch index 406c3d5ef..8f51675ea 100644 --- a/IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch +++ b/IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch @@ -24,10 +24,10 @@ Signed-off-by: Or Gerlitz 1 file changed, 8 insertions(+) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c -index df0c4f605a21..dfa4286f98a4 100644 +index aec7a6aa2951..8c014b5dab4c 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c -@@ -94,6 +94,14 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, +@@ -99,6 +99,14 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, if (dmasync) dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs); diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index 6e518e0cf..d1a77cfc8 100644 --- a/KEYS-Add-a-system-blacklist-keyring.patch +++ b/KEYS-Add-a-system-blacklist-keyring.patch @@ -29,10 +29,10 @@ index 72665eb80692..2c7b80d31366 100644 + #endif /* _KEYS_SYSTEM_KEYRING_H */ diff --git a/init/Kconfig b/init/Kconfig -index 2081a4d3d917..d99a519bb9ae 100644 +index 9afb971497f4..ea0dbdf29b75 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1747,6 +1747,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1742,6 +1742,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch index 5df360b3a..913044ec5 100644 --- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch +++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch @@ -43,10 +43,10 @@ Signed-off-by: Josh Stone 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 62b333802a0e..7d683b59afa4 100644 +index e49665a2b5ac..9c406fc67e0e 100644 --- a/Makefile +++ b/Makefile -@@ -704,7 +704,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer +@@ -706,7 +706,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer endif endif @@ -59,7 +59,7 @@ index 62b333802a0e..7d683b59afa4 100644 ifdef CONFIG_DEBUG_INFO ifdef CONFIG_DEBUG_INFO_SPLIT diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 4e35a5d767ed..27410417de1d 100644 +index 5f2ce616c046..6525e2a5619a 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4 diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch index 672e711f7..3789cd79c 100644 --- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -25,10 +25,10 @@ Signed-off-by: Josh Boyer create mode 100644 kernel/modsign_uefi.c diff --git a/include/linux/efi.h b/include/linux/efi.h -index b1d686e9175e..4d41f4532127 100644 +index fb972b96959a..581878071c85 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -592,6 +592,12 @@ void efi_native_runtime_setup(void); +@@ -595,6 +595,12 @@ void efi_native_runtime_setup(void); #define EFI_CERT_X509_GUID \ EFI_GUID( 0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 ) @@ -42,10 +42,10 @@ index b1d686e9175e..4d41f4532127 100644 efi_guid_t guid; u64 table; diff --git a/init/Kconfig b/init/Kconfig -index d99a519bb9ae..9ef459bb44b2 100644 +index ea0dbdf29b75..dac9ed0f01f7 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1901,6 +1901,15 @@ config MODULE_SIG_ALL +@@ -1896,6 +1896,15 @@ config MODULE_SIG_ALL comment "Do not forget to sign required modules with scripts/sign-file" depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL @@ -62,7 +62,7 @@ index d99a519bb9ae..9ef459bb44b2 100644 prompt "Which hash algorithm should modules be signed with?" depends on MODULE_SIG diff --git a/kernel/Makefile b/kernel/Makefile -index 17ea6d4a9a24..381fe2d56ed1 100644 +index a59481a3fa6c..04b4ba9e0c9d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -45,6 +45,7 @@ obj-$(CONFIG_UID16) += uid16.o @@ -73,7 +73,7 @@ index 17ea6d4a9a24..381fe2d56ed1 100644 obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o obj-$(CONFIG_KEXEC) += kexec.o -@@ -99,6 +100,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o +@@ -98,6 +99,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o $(obj)/configs.o: $(obj)/config_data.h diff --git a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch index a337a4a4c..9a234bcfc 100644 --- a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch +++ b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch @@ -16,7 +16,7 @@ Signed-off-by: Matthew Garrett 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c -index 2c6643fdc0cf..56333630ab77 100644 +index aa012fb3834b..35cb5e9ff9a1 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -30,6 +30,7 @@ @@ -27,7 +27,7 @@ index 2c6643fdc0cf..56333630ab77 100644 #include "pci.h" static int sysfs_initialized; /* = 0 */ -@@ -703,6 +704,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj, +@@ -709,6 +710,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj, loff_t init_off = off; u8 *data = (u8 *) buf; @@ -37,7 +37,7 @@ index 2c6643fdc0cf..56333630ab77 100644 if (off > dev->cfg_size) return 0; if (off + count > dev->cfg_size) { -@@ -997,6 +1001,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, +@@ -1003,6 +1007,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, resource_size_t start, end; int i; @@ -47,7 +47,7 @@ index 2c6643fdc0cf..56333630ab77 100644 for (i = 0; i < PCI_ROM_RESOURCE; i++) if (res == &pdev->resource[i]) break; -@@ -1098,6 +1105,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj, +@@ -1104,6 +1111,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, loff_t off, size_t count) { diff --git a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch index 0b8b5cc4c..dd42dbdf2 100644 --- a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch +++ b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch @@ -13,10 +13,10 @@ Signed-off-by: Matthew Garrett 1 file changed, 6 insertions(+) diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index c268e2581ed6..fb9ea1172ba8 100644 +index fc9637812d78..dde50e5bf527 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c -@@ -164,6 +164,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf, +@@ -167,6 +167,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf, if (p != *ppos) return -EFBIG; @@ -26,7 +26,7 @@ index c268e2581ed6..fb9ea1172ba8 100644 if (!valid_phys_addr_range(p, count)) return -EFAULT; -@@ -502,6 +505,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, +@@ -505,6 +508,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ int err = 0; diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch index d71933781..70e34b859 100644 --- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch +++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch @@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index f4c71d4a9ba3..37657d6d2433 100644 +index 176d4fe4f076..bd374bd2490b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -3720,7 +3720,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -3793,7 +3793,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. the allocated input device; If set to 0, video driver will only send out the event without touching backlight brightness level. @@ -28,7 +28,7 @@ index f4c71d4a9ba3..37657d6d2433 100644 virtio_mmio.device= [VMMIO] Memory mapped virtio (platform) device. diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 41322591fb43..8a61e5dd397b 100644 +index 3647ce71154c..9dc8ba086596 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot"); diff --git a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch index 077582bb2..7afe23d42 100644 --- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch +++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch @@ -13,7 +13,7 @@ Signed-off-by: Josh Boyer 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c -index 9964f70be98d..d95d258f606c 100644 +index f9eeae871593..aa1dcf3d0216 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -44,6 +44,7 @@ diff --git a/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch b/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch index feaa82e3c..f212c3efb 100644 --- a/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch +++ b/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch @@ -8,7 +8,7 @@ Signed-off-by: Robert Nelson 1 file changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts -index 5dcdcd173572..38439e097b26 100644 +index 0fd89c38cf02..20660917a06f 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -71,6 +71,24 @@ diff --git a/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch b/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch index 55450814b..46a151a9f 100644 --- a/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch +++ b/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch @@ -11,10 +11,10 @@ Signed-off-by: Robert Nelson 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts -index 901739fcb85a..5dcdcd173572 100644 +index 5c42d259fa68..0fd89c38cf02 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts -@@ -78,5 +78,18 @@ +@@ -78,6 +78,19 @@ pinctrl-0 = <&nxp_hdmi_bonelt_pins>; pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; status = "okay"; @@ -33,6 +33,7 @@ index 901739fcb85a..5dcdcd173572 100644 + }; }; }; + -- 2.1.0 diff --git a/asus-wmi-Restrict-debugfs-interface-when-module-load.patch b/asus-wmi-Restrict-debugfs-interface-when-module-load.patch index 01d2c9386..6dd8b8342 100644 --- a/asus-wmi-Restrict-debugfs-interface-when-module-load.patch +++ b/asus-wmi-Restrict-debugfs-interface-when-module-load.patch @@ -15,10 +15,10 @@ Signed-off-by: Matthew Garrett 1 file changed, 9 insertions(+) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 21fc932da3a1..c6d42ad95c08 100644 +index 7543a56e0f45..93b5a6998371 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c -@@ -1590,6 +1590,9 @@ static int show_dsts(struct seq_file *m, void *data) +@@ -1589,6 +1589,9 @@ static int show_dsts(struct seq_file *m, void *data) int err; u32 retval = -1; @@ -28,7 +28,7 @@ index 21fc932da3a1..c6d42ad95c08 100644 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval); if (err < 0) -@@ -1606,6 +1609,9 @@ static int show_devs(struct seq_file *m, void *data) +@@ -1605,6 +1608,9 @@ static int show_devs(struct seq_file *m, void *data) int err; u32 retval = -1; @@ -38,7 +38,7 @@ index 21fc932da3a1..c6d42ad95c08 100644 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param, &retval); -@@ -1630,6 +1636,9 @@ static int show_call(struct seq_file *m, void *data) +@@ -1629,6 +1635,9 @@ static int show_call(struct seq_file *m, void *data) union acpi_object *obj; acpi_status status; diff --git a/crash-driver.patch b/crash-driver.patch index 5a8fa876f..c9a99b8e2 100644 --- a/crash-driver.patch +++ b/crash-driver.patch @@ -240,10 +240,10 @@ index 000000000000..552be5e2c571 + +#endif /* _S390_CRASH_H */ diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c -index 2a2e35416d2f..a529181429bb 100644 +index 2eb34bdfc613..11ce5c98462c 100644 --- a/arch/s390/mm/maccess.c +++ b/arch/s390/mm/maccess.c -@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(unsigned long addr) +@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr) put_online_cpus(); return bounce; } @@ -251,7 +251,7 @@ index 2a2e35416d2f..a529181429bb 100644 /* * Free converted buffer for /dev/mem access (if necessary) -@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(unsigned long addr, void *buf) +@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf) if ((void *) addr != buf) free_page((unsigned long) buf); } diff --git a/criu-no-expert.patch b/criu-no-expert.patch index 11d3c87d5..2e7ca9138 100644 --- a/criu-no-expert.patch +++ b/criu-no-expert.patch @@ -9,10 +9,10 @@ Upstream-status: Fedora mustard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig -index 9ef459bb44b2..cc096e258a4a 100644 +index dac9ed0f01f7..31a29fe7c555 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP +@@ -1128,7 +1128,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 9ef459bb44b2..cc096e258a4a 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1160,7 +1160,7 @@ config CHECKPOINT_RESTORE +@@ -1139,7 +1139,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch index 9f816b762..793bada3d 100644 --- a/disable-i8042-check-on-apple-mac.patch +++ b/disable-i8042-check-on-apple-mac.patch @@ -17,10 +17,10 @@ Signed-off-by: Bastien Nocera 1 file changed, 22 insertions(+) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c -index 739f57b35fa3..8af45db27310 100644 +index bfb0b2280df0..06b10fe7e65b 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c -@@ -1485,6 +1485,22 @@ static struct platform_driver i8042_driver = { +@@ -1484,6 +1484,22 @@ static struct platform_driver i8042_driver = { .shutdown = i8042_shutdown, }; @@ -43,7 +43,7 @@ index 739f57b35fa3..8af45db27310 100644 static int __init i8042_init(void) { struct platform_device *pdev; -@@ -1492,6 +1508,12 @@ static int __init i8042_init(void) +@@ -1491,6 +1507,12 @@ static int __init i8042_init(void) dbg_init(); diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch index 6e25762b8..5294070e5 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -14,7 +14,7 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 76cd2205bc9c..b1285eec32ba 100644 +index 95aa615a8760..e3464e44e805 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10869,7 +10869,7 @@ check_crtc_state(struct drm_device *dev) diff --git a/drm-i915-tame-the-chattermouth-v2.patch b/drm-i915-tame-the-chattermouth-v2.patch index 125a7380a..bc7e1903d 100644 --- a/drm-i915-tame-the-chattermouth-v2.patch +++ b/drm-i915-tame-the-chattermouth-v2.patch @@ -28,7 +28,7 @@ Signed-off-by: Daniel Vetter 4 files changed, 104 insertions(+), 69 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 9d7a7155bf02..d04ed2b2728e 100644 +index 0936b0f94826..ca95b4b0b563 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -60,6 +60,35 @@ @@ -67,7 +67,7 @@ index 9d7a7155bf02..d04ed2b2728e 100644 enum pipe { INVALID_PIPE = -1, PIPE_A = 0, -@@ -2309,6 +2338,7 @@ struct i915_params { +@@ -2310,6 +2339,7 @@ struct i915_params { bool disable_vtd_wa; int use_mmio_flip; bool mmio_debug; @@ -96,7 +96,7 @@ index c91cb2033cc5..db07153b693f 100644 +MODULE_PARM_DESC(verbose_state_checks, + "Enable verbose logs (ie. WARN_ON()) in case of unexpected hw state conditions."); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index e7a16f119a29..76cd2205bc9c 100644 +index 30d4eb300be0..95aa615a8760 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1024,7 +1024,7 @@ void assert_pll(struct drm_i915_private *dev_priv, @@ -535,7 +535,7 @@ index e7a16f119a29..76cd2205bc9c 100644 "pll hw state mismatch\n"); } diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index 5cecc20efa71..841e3d0b223d 100644 +index 9f6c8971855c..67adf6437f78 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1558,7 +1558,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp) diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch index f6cc658f7..ef1733bb3 100644 --- a/efi-Add-EFI_SECURE_BOOT-bit.patch +++ b/efi-Add-EFI_SECURE_BOOT-bit.patch @@ -12,10 +12,10 @@ Signed-off-by: Josh Boyer 2 files changed, 3 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index f4eb99432db1..bc31a43b31a0 100644 +index 5d52d67d5097..b40d6174242f 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1152,7 +1152,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1154,7 +1154,9 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE if (boot_params.secure_boot) { @@ -26,10 +26,10 @@ index f4eb99432db1..bc31a43b31a0 100644 #endif diff --git a/include/linux/efi.h b/include/linux/efi.h -index 0949f9c7e872..130ba866a24a 100644 +index 0238d612750e..16ec1c00919d 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -936,6 +936,7 @@ extern int __init efi_setup_pcdp_console(char *); +@@ -940,6 +940,7 @@ extern int __init efi_setup_pcdp_console(char *); #define EFI_64BIT 5 /* Is the firmware 64-bit? */ #define EFI_PARAVIRT 6 /* Access is via a paravirt interface */ #define EFI_ARCH_1 7 /* First arch-specific bit */ diff --git a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch index c9e629d62..2238eeda3 100644 --- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch +++ b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch @@ -14,7 +14,7 @@ Signed-off-by: Josh Boyer 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -index 6da2da7ac9c3..ba3cf70c7d5a 100644 +index 2192da755e34..4b03911a502d 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -831,8 +831,9 @@ out: diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch index e6c792878..89741c349 100644 --- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch +++ b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch @@ -11,10 +11,10 @@ Signed-off-by: Josh Boyer 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 39fc1cd142a1..9d27a01f450d 100644 +index 58273956750d..e17f88ceaeab 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1616,7 +1616,8 @@ config EFI_MIXED +@@ -1661,7 +1661,8 @@ config EFI_MIXED If unsure, say N. config EFI_SECURE_BOOT_SIG_ENFORCE diff --git a/ext4-Allocate-entire-range-in-zero-range.patch b/ext4-Allocate-entire-range-in-zero-range.patch index fdace6dd6..3b35e1a1b 100644 --- a/ext4-Allocate-entire-range-in-zero-range.patch +++ b/ext4-Allocate-entire-range-in-zero-range.patch @@ -22,10 +22,10 @@ Signed-off-by: Lukas Czerner 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c -index 0b16fb4c06d3..e3bf236a36ac 100644 +index bed43081720f..aa522429b751 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c -@@ -4792,12 +4792,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, +@@ -4803,12 +4803,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, else max_blocks -= lblk; @@ -38,7 +38,7 @@ index 0b16fb4c06d3..e3bf236a36ac 100644 mutex_lock(&inode->i_mutex); /* -@@ -4814,15 +4808,28 @@ static long ext4_zero_range(struct file *file, loff_t offset, +@@ -4825,15 +4819,28 @@ static long ext4_zero_range(struct file *file, loff_t offset, ret = inode_newsize_ok(inode, new_size); if (ret) goto out_mutex; diff --git a/input-kill-stupid-messages.patch b/input-kill-stupid-messages.patch index 5b9c3d923..fe01d3a75 100644 --- a/input-kill-stupid-messages.patch +++ b/input-kill-stupid-messages.patch @@ -9,7 +9,7 @@ Upstream-status: Fedora mustard 1 file changed, 4 insertions(+) diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c -index 6f5d79569136..95469f6ecfa5 100644 +index e27a25892db4..9ab0a86cc03d 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -436,11 +436,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch index 5172c53ab..7da6bc888 100644 --- a/input-silence-i8042-noise.patch +++ b/input-silence-i8042-noise.patch @@ -29,7 +29,7 @@ index 9717d5f20139..a3101d2fd936 100644 if (dev->parent && dev->parent->power.is_prepared) dev_warn(dev, "parent %s should not be sleeping\n", diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c -index 804d2e02010a..739f57b35fa3 100644 +index 986a71c614b0..bfb0b2280df0 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -871,7 +871,6 @@ static int __init i8042_check_aux(void) @@ -41,10 +41,10 @@ index 804d2e02010a..739f57b35fa3 100644 } diff --git a/net/can/af_can.c b/net/can/af_can.c -index ce82337521f6..a3fee4becc93 100644 +index 66e08040ced7..5268a601f406 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c -@@ -158,13 +158,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol, +@@ -155,13 +155,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol, err = request_module("can-proto-%d", protocol); /* diff --git a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch index eac51c600..d521c804d 100644 --- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch +++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch @@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett 1 file changed, 8 insertions(+) diff --git a/kernel/kexec.c b/kernel/kexec.c -index 2abf9f6e9a61..417bd0599024 100644 +index 9a8a01abbaed..9a0ecbf14545 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -36,6 +36,7 @@ diff --git a/no-pcspkr-modalias.patch b/no-pcspkr-modalias.patch index a258676c3..28008094d 100644 --- a/no-pcspkr-modalias.patch +++ b/no-pcspkr-modalias.patch @@ -9,7 +9,7 @@ Upstream-status: Fedora mustard 1 file changed, 1 deletion(-) diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c -index 674a2cfc3c0e..9a2807227c69 100644 +index 72b1fc3ab910..86907eaa4883 100644 --- a/drivers/input/misc/pcspkr.c +++ b/drivers/input/misc/pcspkr.c @@ -23,7 +23,6 @@ diff --git a/pinctrl-pinctrl-single-must-be-initialized-early.patch b/pinctrl-pinctrl-single-must-be-initialized-early.patch index 765ec1d3d..5aa4bd22f 100644 --- a/pinctrl-pinctrl-single-must-be-initialized-early.patch +++ b/pinctrl-pinctrl-single-must-be-initialized-early.patch @@ -10,10 +10,10 @@ exercise left to the reader. 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c -index fb94b772ad62..99668ad01b54 100644 +index 69e84427f913..f21cf4291476 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c -@@ -2026,7 +2026,17 @@ static struct platform_driver pcs_driver = { +@@ -2025,7 +2025,17 @@ static struct platform_driver pcs_driver = { #endif }; diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch index 3176c9ec3..6c1c22779 100644 --- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch +++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -9,10 +9,10 @@ Upstream-status: Fedora mustard (might be worth dropping...) 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index dd8c8d690763..100e6a54264d 100644 +index 05ea0d49a3a3..95f18e07491b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -2768,13 +2768,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp) +@@ -2750,13 +2750,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp) static int sd_revalidate_disk(struct gendisk *disk) { struct scsi_disk *sdkp = scsi_disk(disk); diff --git a/vhost-scsi-potential-memory-corruption.patch b/vhost-scsi-potential-memory-corruption.patch index 8f61d9267..923fecc62 100644 --- a/vhost-scsi-potential-memory-corruption.patch +++ b/vhost-scsi-potential-memory-corruption.patch @@ -21,10 +21,10 @@ Signed-off-by: Nicholas Bellinger 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c -index cb84f69f76ad..28cf2510d33b 100644 +index d695b1673ae5..f5c98e6f7b58 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c -@@ -1251,7 +1251,7 @@ tcm_vhost_send_evt(struct vhost_scsi *vs, +@@ -1253,7 +1253,7 @@ tcm_vhost_send_evt(struct vhost_scsi *vs, * lun[4-7] need to be zero according to virtio-scsi spec. */ evt->event.lun[0] = 0x01; @@ -33,7 +33,7 @@ index cb84f69f76ad..28cf2510d33b 100644 if (lun->unpacked_lun >= 256) evt->event.lun[2] = lun->unpacked_lun >> 8 | 0x40 ; evt->event.lun[3] = lun->unpacked_lun & 0xFF; -@@ -2122,12 +2122,12 @@ tcm_vhost_make_tpg(struct se_wwn *wwn, +@@ -2124,12 +2124,12 @@ tcm_vhost_make_tpg(struct se_wwn *wwn, struct tcm_vhost_tport, tport_wwn); struct tcm_vhost_tpg *tpg; diff --git a/x86-Lock-down-IO-port-access-when-module-security-is.patch b/x86-Lock-down-IO-port-access-when-module-security-is.patch index 13392c902..cf57f33bd 100644 --- a/x86-Lock-down-IO-port-access-when-module-security-is.patch +++ b/x86-Lock-down-IO-port-access-when-module-security-is.patch @@ -44,7 +44,7 @@ index 4ddaf66ea35f..00b440307419 100644 } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index 524b707894ef..c268e2581ed6 100644 +index 4c58333b4257..fc9637812d78 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -27,6 +27,7 @@ @@ -55,7 +55,7 @@ index 524b707894ef..c268e2581ed6 100644 #include -@@ -568,6 +569,9 @@ static ssize_t write_port(struct file *file, const char __user *buf, +@@ -571,6 +572,9 @@ static ssize_t write_port(struct file *file, const char __user *buf, unsigned long i = *ppos; const char __user *tmp = buf; diff --git a/x86-Restrict-MSR-access-when-module-loading-is-restr.patch b/x86-Restrict-MSR-access-when-module-loading-is-restr.patch index 12eedc931..39ea0604b 100644 --- a/x86-Restrict-MSR-access-when-module-loading-is-restr.patch +++ b/x86-Restrict-MSR-access-when-module-loading-is-restr.patch @@ -13,10 +13,10 @@ Signed-off-by: Matthew Garrett 1 file changed, 7 insertions(+) diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c -index c9603ac80de5..8bef43fc3f40 100644 +index 113e70784854..26c2f83fc470 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c -@@ -103,6 +103,9 @@ static ssize_t msr_write(struct file *file, const char __user *buf, +@@ -105,6 +105,9 @@ static ssize_t msr_write(struct file *file, const char __user *buf, int err = 0; ssize_t bytes = 0; @@ -26,7 +26,7 @@ index c9603ac80de5..8bef43fc3f40 100644 if (count % 8) return -EINVAL; /* Invalid chunk size */ -@@ -150,6 +153,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg) +@@ -152,6 +155,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg) err = -EBADF; break; }