From: Greg Kroah-Hartman Date: Thu, 21 Mar 2019 08:19:20 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v3.18.137~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a682a0f5dc6f045e4b75ab5228c1e1028c17957;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: dm-fix-to_sector-for-32bit.patch dm-integrity-limit-the-rate-of-error-messages.patch ipmi_si-fix-use-after-free-of-resource-name.patch --- diff --git a/queue-4.19/dm-fix-to_sector-for-32bit.patch b/queue-4.19/dm-fix-to_sector-for-32bit.patch new file mode 100644 index 00000000000..a8dab117629 --- /dev/null +++ b/queue-4.19/dm-fix-to_sector-for-32bit.patch @@ -0,0 +1,43 @@ +From 0bdb50c531f7377a9da80d3ce2d61f389c84cb30 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Sun, 6 Jan 2019 21:06:25 +1100 +Subject: dm: fix to_sector() for 32bit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: NeilBrown + +commit 0bdb50c531f7377a9da80d3ce2d61f389c84cb30 upstream. + +A dm-raid array with devices larger than 4GB won't assemble on +a 32 bit host since _check_data_dev_sectors() was added in 4.16. +This is because to_sector() treats its argument as an "unsigned long" +which is 32bits (4GB) on a 32bit host. Using "unsigned long long" +is more correct. + +Kernels as early as 4.2 can have other problems due to to_sector() +being used on the size of a device. + +Fixes: 0cf4503174c1 ("dm raid: add support for the MD RAID0 personality") +cc: stable@vger.kernel.org (v4.2+) +Reported-and-tested-by: Guillaume Perréal +Signed-off-by: NeilBrown +Signed-off-by: Mike Snitzer +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/device-mapper.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/device-mapper.h ++++ b/include/linux/device-mapper.h +@@ -601,7 +601,7 @@ do { \ + */ + #define dm_target_offset(ti, sector) ((sector) - (ti)->begin) + +-static inline sector_t to_sector(unsigned long n) ++static inline sector_t to_sector(unsigned long long n) + { + return (n >> SECTOR_SHIFT); + } diff --git a/queue-4.19/dm-integrity-limit-the-rate-of-error-messages.patch b/queue-4.19/dm-integrity-limit-the-rate-of-error-messages.patch new file mode 100644 index 00000000000..a5b991dbe3d --- /dev/null +++ b/queue-4.19/dm-integrity-limit-the-rate-of-error-messages.patch @@ -0,0 +1,51 @@ +From 225557446856448039a9e495da37b72c20071ef2 Mon Sep 17 00:00:00 2001 +From: Mikulas Patocka +Date: Wed, 6 Mar 2019 08:29:34 -0500 +Subject: dm integrity: limit the rate of error messages + +From: Mikulas Patocka + +commit 225557446856448039a9e495da37b72c20071ef2 upstream. + +When using dm-integrity underneath md-raid, some tests with raid +auto-correction trigger large amounts of integrity failures - and all +these failures print an error message. These messages can bring the +system to a halt if the system is using serial console. + +Fix this by limiting the rate of error messages - it improves the speed +of raid recovery and avoids the hang. + +Fixes: 7eada909bfd7a ("dm: add integrity target") +Cc: stable@vger.kernel.org # v4.12+ +Signed-off-by: Mikulas Patocka +Signed-off-by: Mike Snitzer +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/dm-integrity.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/md/dm-integrity.c ++++ b/drivers/md/dm-integrity.c +@@ -1357,8 +1357,8 @@ again: + checksums_ptr - checksums, !dio->write ? TAG_CMP : TAG_WRITE); + if (unlikely(r)) { + if (r > 0) { +- DMERR("Checksum failed at sector 0x%llx", +- (unsigned long long)(sector - ((r + ic->tag_size - 1) / ic->tag_size))); ++ DMERR_LIMIT("Checksum failed at sector 0x%llx", ++ (unsigned long long)(sector - ((r + ic->tag_size - 1) / ic->tag_size))); + r = -EILSEQ; + atomic64_inc(&ic->number_of_mismatches); + } +@@ -1550,8 +1550,8 @@ retry_kmap: + + integrity_sector_checksum(ic, logical_sector, mem + bv.bv_offset, checksums_onstack); + if (unlikely(memcmp(checksums_onstack, journal_entry_tag(ic, je), ic->tag_size))) { +- DMERR("Checksum failed when reading from journal, at sector 0x%llx", +- (unsigned long long)logical_sector); ++ DMERR_LIMIT("Checksum failed when reading from journal, at sector 0x%llx", ++ (unsigned long long)logical_sector); + } + } + #endif diff --git a/queue-4.19/ipmi_si-fix-use-after-free-of-resource-name.patch b/queue-4.19/ipmi_si-fix-use-after-free-of-resource-name.patch new file mode 100644 index 00000000000..3aa98c028fa --- /dev/null +++ b/queue-4.19/ipmi_si-fix-use-after-free-of-resource-name.patch @@ -0,0 +1,152 @@ +From 401e7e88d4ef80188ffa07095ac00456f901b8c4 Mon Sep 17 00:00:00 2001 +From: Yang Yingliang +Date: Mon, 28 Jan 2019 11:08:54 +0800 +Subject: ipmi_si: fix use-after-free of resource->name + +From: Yang Yingliang + +commit 401e7e88d4ef80188ffa07095ac00456f901b8c4 upstream. + +When we excute the following commands, we got oops +rmmod ipmi_si +cat /proc/ioports + +[ 1623.482380] Unable to handle kernel paging request at virtual address ffff00000901d478 +[ 1623.482382] Mem abort info: +[ 1623.482383] ESR = 0x96000007 +[ 1623.482385] Exception class = DABT (current EL), IL = 32 bits +[ 1623.482386] SET = 0, FnV = 0 +[ 1623.482387] EA = 0, S1PTW = 0 +[ 1623.482388] Data abort info: +[ 1623.482389] ISV = 0, ISS = 0x00000007 +[ 1623.482390] CM = 0, WnR = 0 +[ 1623.482393] swapper pgtable: 4k pages, 48-bit VAs, pgdp = 00000000d7d94a66 +[ 1623.482395] [ffff00000901d478] pgd=000000dffbfff003, pud=000000dffbffe003, pmd=0000003f5d06e003, pte=0000000000000000 +[ 1623.482399] Internal error: Oops: 96000007 [#1] SMP +[ 1623.487407] Modules linked in: ipmi_si(E) nls_utf8 isofs rpcrdma ib_iser ib_srpt target_core_mod ib_srp scsi_transport_srp ib_ipoib rdma_ucm ib_umad rdma_cm ib_cm dm_mirror dm_region_hash dm_log iw_cm dm_mod aes_ce_blk crypto_simd cryptd aes_ce_cipher ses ghash_ce sha2_ce enclosure sha256_arm64 sg sha1_ce hisi_sas_v2_hw hibmc_drm sbsa_gwdt hisi_sas_main ip_tables mlx5_ib ib_uverbs marvell ib_core mlx5_core ixgbe mdio hns_dsaf ipmi_devintf hns_enet_drv ipmi_msghandler hns_mdio [last unloaded: ipmi_si] +[ 1623.532410] CPU: 30 PID: 11438 Comm: cat Kdump: loaded Tainted: G E 5.0.0-rc3+ #168 +[ 1623.541498] Hardware name: Huawei TaiShan 2280 /BC11SPCD, BIOS 1.37 11/21/2017 +[ 1623.548822] pstate: a0000005 (NzCv daif -PAN -UAO) +[ 1623.553684] pc : string+0x28/0x98 +[ 1623.557040] lr : vsnprintf+0x368/0x5e8 +[ 1623.560837] sp : ffff000013213a80 +[ 1623.564191] x29: ffff000013213a80 x28: ffff00001138abb5 +[ 1623.569577] x27: ffff000013213c18 x26: ffff805f67d06049 +[ 1623.574963] x25: 0000000000000000 x24: ffff00001138abb5 +[ 1623.580349] x23: 0000000000000fb7 x22: ffff0000117ed000 +[ 1623.585734] x21: ffff000011188fd8 x20: ffff805f67d07000 +[ 1623.591119] x19: ffff805f67d06061 x18: ffffffffffffffff +[ 1623.596505] x17: 0000000000000200 x16: 0000000000000000 +[ 1623.601890] x15: ffff0000117ed748 x14: ffff805f67d07000 +[ 1623.607276] x13: ffff805f67d0605e x12: 0000000000000000 +[ 1623.612661] x11: 0000000000000000 x10: 0000000000000000 +[ 1623.618046] x9 : 0000000000000000 x8 : 000000000000000f +[ 1623.623432] x7 : ffff805f67d06061 x6 : fffffffffffffffe +[ 1623.628817] x5 : 0000000000000012 x4 : ffff00000901d478 +[ 1623.634203] x3 : ffff0a00ffffff04 x2 : ffff805f67d07000 +[ 1623.639588] x1 : ffff805f67d07000 x0 : ffffffffffffffff +[ 1623.644974] Process cat (pid: 11438, stack limit = 0x000000008d4cbc10) +[ 1623.651592] Call trace: +[ 1623.654068] string+0x28/0x98 +[ 1623.657071] vsnprintf+0x368/0x5e8 +[ 1623.660517] seq_vprintf+0x70/0x98 +[ 1623.668009] seq_printf+0x7c/0xa0 +[ 1623.675530] r_show+0xc8/0xf8 +[ 1623.682558] seq_read+0x330/0x440 +[ 1623.689877] proc_reg_read+0x78/0xd0 +[ 1623.697346] __vfs_read+0x60/0x1a0 +[ 1623.704564] vfs_read+0x94/0x150 +[ 1623.711339] ksys_read+0x6c/0xd8 +[ 1623.717939] __arm64_sys_read+0x24/0x30 +[ 1623.725077] el0_svc_common+0x120/0x148 +[ 1623.732035] el0_svc_handler+0x30/0x40 +[ 1623.738757] el0_svc+0x8/0xc +[ 1623.744520] Code: d1000406 aa0103e2 54000149 b4000080 (39400085) +[ 1623.753441] ---[ end trace f91b6a4937de9835 ]--- +[ 1623.760871] Kernel panic - not syncing: Fatal exception +[ 1623.768935] SMP: stopping secondary CPUs +[ 1623.775718] Kernel Offset: disabled +[ 1623.781998] CPU features: 0x002,21006008 +[ 1623.788777] Memory Limit: none +[ 1623.798329] Starting crashdump kernel... +[ 1623.805202] Bye! + +If io_setup is called successful in try_smi_init() but try_smi_init() +goes out_err before calling ipmi_register_smi(), so ipmi_unregister_smi() +will not be called while removing module. It leads to the resource that +allocated in io_setup() can not be freed, but the name(DEVICE_NAME) of +resource is freed while removing the module. It causes use-after-free +when cat /proc/ioports. + +Fix this by calling io_cleanup() while try_smi_init() goes to out_err. +and don't call io_cleanup() until io_setup() returns successful to avoid +warning prints. + +Fixes: 93c303d2045b ("ipmi_si: Clean up shutdown a bit") +Cc: stable@vger.kernel.org +Reported-by: NuoHan Qiao +Suggested-by: Corey Minyard +Signed-off-by: Yang Yingliang +Signed-off-by: Corey Minyard +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/ipmi/ipmi_si_intf.c | 5 +++++ + drivers/char/ipmi/ipmi_si_mem_io.c | 5 +++-- + drivers/char/ipmi/ipmi_si_port_io.c | 5 +++-- + 3 files changed, 11 insertions(+), 4 deletions(-) + +--- a/drivers/char/ipmi/ipmi_si_intf.c ++++ b/drivers/char/ipmi/ipmi_si_intf.c +@@ -2085,6 +2085,11 @@ static int try_smi_init(struct smi_info + WARN_ON(new_smi->io.dev->init_name != NULL); + + out_err: ++ if (rv && new_smi->io.io_cleanup) { ++ new_smi->io.io_cleanup(&new_smi->io); ++ new_smi->io.io_cleanup = NULL; ++ } ++ + kfree(init_name); + return rv; + } +--- a/drivers/char/ipmi/ipmi_si_mem_io.c ++++ b/drivers/char/ipmi/ipmi_si_mem_io.c +@@ -81,8 +81,6 @@ int ipmi_si_mem_setup(struct si_sm_io *i + if (!addr) + return -ENODEV; + +- io->io_cleanup = mem_cleanup; +- + /* + * Figure out the actual readb/readw/readl/etc routine to use based + * upon the register size. +@@ -141,5 +139,8 @@ int ipmi_si_mem_setup(struct si_sm_io *i + mem_region_cleanup(io, io->io_size); + return -EIO; + } ++ ++ io->io_cleanup = mem_cleanup; ++ + return 0; + } +--- a/drivers/char/ipmi/ipmi_si_port_io.c ++++ b/drivers/char/ipmi/ipmi_si_port_io.c +@@ -68,8 +68,6 @@ int ipmi_si_port_setup(struct si_sm_io * + if (!addr) + return -ENODEV; + +- io->io_cleanup = port_cleanup; +- + /* + * Figure out the actual inb/inw/inl/etc routine to use based + * upon the register size. +@@ -109,5 +107,8 @@ int ipmi_si_port_setup(struct si_sm_io * + return -EIO; + } + } ++ ++ io->io_cleanup = port_cleanup; ++ + return 0; + } diff --git a/queue-4.19/series b/queue-4.19/series index 1d29ec549cf..f8989ebb4fc 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -232,3 +232,6 @@ arm-s3c24xx-fix-boolean-expressions-in-osiris_dvs_notify.patch arm64-fix-hcr.tge-status-for-nmi-contexts.patch arm64-debug-ensure-debug-handlers-check-triggering-exception-level.patch arm64-kvm-fix-architecturally-invalid-reset-value-for-fpexc32_el2.patch +ipmi_si-fix-use-after-free-of-resource-name.patch +dm-fix-to_sector-for-32bit.patch +dm-integrity-limit-the-rate-of-error-messages.patch