diff options
Diffstat (limited to 'SOURCES/patch-6.10-redhat.patch')
| -rw-r--r-- | SOURCES/patch-6.10-redhat.patch | 110 |
1 files changed, 48 insertions, 62 deletions
diff --git a/SOURCES/patch-6.10-redhat.patch b/SOURCES/patch-6.10-redhat.patch index 86a5055..207bf7f 100644 --- a/SOURCES/patch-6.10-redhat.patch +++ b/SOURCES/patch-6.10-redhat.patch @@ -32,7 +32,6 @@ drivers/pci/quirks.c | 24 ++++ drivers/scsi/sd.c | 10 ++ drivers/usb/core/hub.c | 7 + - fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- include/linux/crypto.h | 1 + include/linux/efi.h | 22 ++- include/linux/lsm_hook_defs.h | 2 + @@ -46,10 +45,10 @@ security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 48 files changed, 828 insertions(+), 257 deletions(-) + 47 files changed, 827 insertions(+), 256 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst -index eec8df1dde06..88f49dd10cd0 100644 +index eec8df1dde06a..88f49dd10cd06 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -2445,8 +2445,11 @@ registers, find a list below: @@ -65,7 +64,7 @@ index eec8df1dde06..88f49dd10cd0 100644 ... PPC KVM_REG_PPC_TM_GPR31 64 diff --git a/Makefile b/Makefile -index 2e5ac6ab3d47..838301b19917 100644 +index 175d7f27ea32a..52eef3d589e67 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -88,7 +87,7 @@ index 2e5ac6ab3d47..838301b19917 100644 # to get the ordering right. # diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index ee5115252aac..7f3796df8404 100644 +index ee5115252aac4..7f3796df84041 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1224,9 +1224,9 @@ config HIGHMEM @@ -104,7 +103,7 @@ index ee5115252aac..7f3796df8404 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 11bbdc15c6e5..9cecc1448e3c 100644 +index 11bbdc15c6e5e..9cecc1448e3c6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1364,7 +1364,7 @@ endchoice @@ -117,7 +116,7 @@ index 11bbdc15c6e5..9cecc1448e3c 100644 For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h -index 8abac532146e..6a0c771d3ce8 100644 +index 8abac532146e7..6a0c771d3ce89 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h @@ -599,6 +599,9 @@ struct kvm_vcpu_arch { @@ -131,7 +130,7 @@ index 8abac532146e..6a0c771d3ce8 100644 ulong cfar; ulong ppr; diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h -index 1691297a766a..eaeda001784e 100644 +index 1691297a766a9..eaeda001784eb 100644 --- a/arch/powerpc/include/uapi/asm/kvm.h +++ b/arch/powerpc/include/uapi/asm/kvm.h @@ -645,6 +645,9 @@ struct kvm_ppc_cpu_char { @@ -145,7 +144,7 @@ index 1691297a766a..eaeda001784e 100644 /* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c -index d8352e4d9cdc..36068c3ed8a7 100644 +index d8352e4d9cdc7..36068c3ed8a76 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -2349,6 +2349,15 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, @@ -181,7 +180,7 @@ index d8352e4d9cdc..36068c3ed8a7 100644 kvmppc_set_ciabr_hv(vcpu, set_reg_val(id, *val)); /* Don't allow setting breakpoints in hypervisor code */ diff --git a/arch/powerpc/kvm/book3s_hv.h b/arch/powerpc/kvm/book3s_hv.h -index 47b2c815641e..a404c9b221c1 100644 +index 47b2c815641e4..a404c9b221c1a 100644 --- a/arch/powerpc/kvm/book3s_hv.h +++ b/arch/powerpc/kvm/book3s_hv.h @@ -116,6 +116,9 @@ KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawr0, 64, KVMPPC_GSID_DAWR0) @@ -195,7 +194,7 @@ index 47b2c815641e..a404c9b221c1 100644 KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(wort, 64, KVMPPC_GSID_WORT) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(ppr, 64, KVMPPC_GSID_PPR) diff --git a/arch/powerpc/kvm/book3s_hv_nestedv2.c b/arch/powerpc/kvm/book3s_hv_nestedv2.c -index 342f58314770..eeecea8f202b 100644 +index 342f583147709..eeecea8f202b3 100644 --- a/arch/powerpc/kvm/book3s_hv_nestedv2.c +++ b/arch/powerpc/kvm/book3s_hv_nestedv2.c @@ -193,6 +193,15 @@ static int gs_msg_ops_vcpu_fill_info(struct kvmppc_gs_buff *gsb, @@ -231,7 +230,7 @@ index 342f58314770..eeecea8f202b 100644 vcpu->arch.ciabr = kvmppc_gse_get_u64(gse); break; diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h -index b0d00032479d..afb9544fb007 100644 +index b0d00032479d6..afb9544fb0074 100644 --- a/arch/s390/include/asm/ipl.h +++ b/arch/s390/include/asm/ipl.h @@ -139,6 +139,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, @@ -243,7 +242,7 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 3a7d6e172211..8163a2173247 100644 +index 3a7d6e1722112..8163a2173247e 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2479,3 +2479,8 @@ int ipl_report_free(struct ipl_report *report) @@ -256,7 +255,7 @@ index 3a7d6e172211..8163a2173247 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 610e6f794511..4fc7aca3f572 100644 +index 610e6f794511a..4fc7aca3f572c 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -278,7 +277,7 @@ index 610e6f794511..4fc7aca3f572 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 05c5aa951da7..da521c6f1cf2 100644 +index 05c5aa951da74..da521c6f1cf2d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -325,7 +324,7 @@ index 05c5aa951da7..da521c6f1cf2 100644 reserve_initrd(); diff --git a/certs/extract-cert.c b/certs/extract-cert.c -index 70e9ec89d87d..f5fb74916cee 100644 +index 70e9ec89d87d3..f5fb74916cee4 100644 --- a/certs/extract-cert.c +++ b/certs/extract-cert.c @@ -21,7 +21,6 @@ @@ -368,7 +367,7 @@ index 70e9ec89d87d..f5fb74916cee 100644 BIO *b; X509 *x509; diff --git a/crypto/drbg.c b/crypto/drbg.c -index 3addce90930c..730b03de596a 100644 +index 3addce90930c3..730b03de596a3 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1494,13 +1494,14 @@ static int drbg_generate(struct drbg_state *drbg, @@ -423,7 +422,7 @@ index 3addce90930c..730b03de596a 100644 /* diff --git a/crypto/rng.c b/crypto/rng.c -index 9d8804e46422..5ccb0485ff4b 100644 +index 9d8804e464226..5ccb0485ff4b2 100644 --- a/crypto/rng.c +++ b/crypto/rng.c @@ -12,10 +12,13 @@ @@ -642,7 +641,7 @@ index 9d8804e46422..5ccb0485ff4b 100644 MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Random Number Generator"); diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 20d757687e3d..90a13f20f052 100644 +index 20d757687e3d9..90a13f20f052b 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -142,6 +142,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data) @@ -661,7 +660,7 @@ index 20d757687e3d..90a13f20f052 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index 1687483ff319..390b67f19181 100644 +index 1687483ff319e..390b67f19181a 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { @@ -704,7 +703,7 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index cdc5a74092c7..45679565878f 100644 +index cdc5a74092c77..45679565878f1 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1793,6 +1793,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -724,7 +723,7 @@ index cdc5a74092c7..45679565878f 100644 acpi_dev_get_resources(device, &resource_list, acpi_check_serial_bus_slave, diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 83431aae74d8..f2a9c0d644af 100644 +index 83431aae74d8b..f2a9c0d644af2 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap) @@ -753,7 +752,7 @@ index 83431aae74d8..f2a9c0d644af 100644 tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c -index bbf7029e224b..cf7faa970dd6 100644 +index bbf7029e224be..cf7faa970dd65 100644 --- a/drivers/char/ipmi/ipmi_dmi.c +++ b/drivers/char/ipmi/ipmi_dmi.c @@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void) @@ -779,7 +778,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index e12b531f5c2f..082707f8dff8 100644 +index e12b531f5c2f3..082707f8dff8c 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -814,7 +813,7 @@ index e12b531f5c2f..082707f8dff8 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index 2597cb43f438..d860f4f6ba2c 100644 +index 2597cb43f4387..d860f4f6ba2c7 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -51,6 +51,7 @@ @@ -1011,7 +1010,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 /******************************************************************** * diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile -index a2d0009560d0..4f3486e6a84b 100644 +index a2d0009560d0f..4f3486e6a84b2 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub @@ -1023,7 +1022,7 @@ index a2d0009560d0..4f3486e6a84b 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index fdf07dd6f459..cfd2b58a3494 100644 +index fdf07dd6f4591..cfd2b58a34940 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -1169,7 +1168,7 @@ index fdf07dd6f459..cfd2b58a3494 100644 diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c new file mode 100644 -index 000000000000..de0a3714a5d4 +index 0000000000000..de0a3714a5d44 --- /dev/null +++ b/drivers/firmware/efi/secureboot.c @@ -0,0 +1,38 @@ @@ -1212,7 +1211,7 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index d4af17fdba46..154f0403cbf4 100644 +index d4af17fdba467..154f0403cbf4c 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -321,21 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) @@ -1314,7 +1313,7 @@ index d4af17fdba46..154f0403cbf4 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index bf01f01964cf..703896981e8a 100644 +index bf01f01964cf9..703896981e8ae 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -10,6 +10,7 @@ @@ -1365,7 +1364,7 @@ index bf01f01964cf..703896981e8a 100644 platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index ef9ea295f9e0..0103334e8f32 100644 +index ef9ea295f9e03..0103334e8f32c 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, @@ -1557,7 +1556,7 @@ index ef9ea295f9e0..0103334e8f32 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 9df7cc75c1bc..60d541ae39e8 100644 +index 9df7cc75c1bc5..60d541ae39e8d 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1597,7 +1596,7 @@ index 9df7cc75c1bc..60d541ae39e8 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c -index 61750cc98d70..a0e9a71580b5 100644 +index 61750cc98d705..a0e9a71580b5d 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -43,28 +43,46 @@ @@ -1659,7 +1658,7 @@ index 61750cc98d70..a0e9a71580b5 100644 static const struct ipu_property_names prop_names = { diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 568410e64ce6..6afbaee83950 100644 +index 568410e64ce64..6afbaee839503 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4433,6 +4433,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1694,7 +1693,7 @@ index 568410e64ce6..6afbaee83950 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 7d2a294ebc3d..c2536099932b 100644 +index 7d2a294ebc3d7..c2536099932b6 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -120,6 +120,14 @@ static const char *sd_cache_types[] = { @@ -1722,7 +1721,7 @@ index 7d2a294ebc3d..c2536099932b 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 4b93c0bd1d4b..b98906237306 100644 +index 4b93c0bd1d4bc..b98906237306d 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5844,6 +5844,13 @@ static void hub_event(struct work_struct *work) @@ -1739,21 +1738,8 @@ index 4b93c0bd1d4b..b98906237306 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); -diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c -index 42e9fd47f6c7..ffef1c75dd57 100644 ---- a/fs/xfs/libxfs/xfs_ialloc_btree.c -+++ b/fs/xfs/libxfs/xfs_ialloc_btree.c -@@ -749,7 +749,7 @@ xfs_finobt_count_blocks( - if (error) - return error; - -- cur = xfs_inobt_init_cursor(pag, tp, agbp); -+ cur = xfs_finobt_init_cursor(pag, tp, agbp); - error = xfs_btree_count_blocks(cur, tree_blocks); - xfs_btree_del_cursor(cur, error); - xfs_trans_brelse(tp, agbp); diff --git a/include/linux/crypto.h b/include/linux/crypto.h -index b164da5e129e..59021b8609a7 100644 +index b164da5e129e8..59021b8609a70 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -133,6 +133,7 @@ @@ -1765,7 +1751,7 @@ index b164da5e129e..59021b8609a7 100644 /* * Miscellaneous stuff. diff --git a/include/linux/efi.h b/include/linux/efi.h -index 418e555459da..fdd941287ae1 100644 +index 418e555459da7..fdd941287ae1d 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -45,6 +45,8 @@ struct screen_info; @@ -1833,7 +1819,7 @@ index 418e555459da..fdd941287ae1 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 855db460e08b..7a8c28cd7510 100644 +index 855db460e08bc..7a8c28cd7510d 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -438,6 +438,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -1846,7 +1832,7 @@ index 855db460e08b..7a8c28cd7510 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/random.h b/include/linux/random.h -index b0a940af4fff..8a52424fd0d5 100644 +index b0a940af4fff5..8a52424fd0d50 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -9,6 +9,13 @@ @@ -1874,7 +1860,7 @@ index b0a940af4fff..8a52424fd0d5 100644 extern const struct file_operations random_fops, urandom_fops; #endif diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index ab7eea01ab42..fff7c5f737fc 100644 +index ab7eea01ab427..fff7c5f737fc8 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -364,6 +364,7 @@ struct rmi_driver_data { @@ -1886,7 +1872,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index de3af33e6ff5..0a37270070e4 100644 +index de3af33e6ff50..0a37270070e4c 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -507,6 +507,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -1909,7 +1895,7 @@ index de3af33e6ff5..0a37270070e4 100644 u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags) diff --git a/kernel/module/signing.c b/kernel/module/signing.c -index a2ff4242e623..f0d2be1ee4f1 100644 +index a2ff4242e623d..f0d2be1ee4f1c 100644 --- a/kernel/module/signing.c +++ b/kernel/module/signing.c @@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info) @@ -1932,7 +1918,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/sign-file.c b/scripts/sign-file.c -index 3edb156ae52c..0114ae1dbf7f 100644 +index 3edb156ae52c3..0114ae1dbf7ff 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -27,7 +27,6 @@ @@ -1986,7 +1972,7 @@ index 3edb156ae52c..0114ae1dbf7f 100644 BIO *b; diff --git a/scripts/tags.sh b/scripts/tags.sh -index 191e0461d6d5..e6f418b3e948 100755 +index 191e0461d6d5b..e6f418b3e948b 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi @@ -1999,7 +1985,7 @@ index 191e0461d6d5..e6f418b3e948 100755 # ignore arbitrary directories if [ -n "${IGNORE_DIRS}" ]; then diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index d1fdd113450a..182e8090cfe8 100644 +index d1fdd113450a6..182e8090cfe85 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, @@ -2023,7 +2009,7 @@ index d1fdd113450a..182e8090cfe8 100644 } diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig -index e84ddf484010..d0501353a4b9 100644 +index e84ddf4840101..d0501353a4b95 100644 --- a/security/lockdown/Kconfig +++ b/security/lockdown/Kconfig @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY @@ -2047,7 +2033,7 @@ index e84ddf484010..d0501353a4b9 100644 prompt "Kernel default lockdown mode" default LOCK_DOWN_KERNEL_FORCE_NONE diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c -index cd84d8ea1dfb..e4c70a0312bc 100644 +index cd84d8ea1dfbf..e4c70a0312bc8 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -74,6 +74,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what) @@ -2059,7 +2045,7 @@ index cd84d8ea1dfb..e4c70a0312bc 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index 8cee5b6c6e6d..489e25946bf9 100644 +index 8cee5b6c6e6d5..489e25946bf96 100644 --- a/security/security.c +++ b/security/security.c @@ -5596,6 +5596,18 @@ int security_locked_down(enum lockdown_reason what) |