From: Sasha Levin Date: Sat, 9 Dec 2023 06:02:30 +0000 (-0500) Subject: Fixes for 4.14 X-Git-Tag: v6.6.6~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd025fd51adc6fdb0371a58d88112eb0071d4165;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/hwmon-acpi_power_meter-fix-4.29-mw-bug.patch b/queue-4.14/hwmon-acpi_power_meter-fix-4.29-mw-bug.patch new file mode 100644 index 00000000000..c8d376f50ed --- /dev/null +++ b/queue-4.14/hwmon-acpi_power_meter-fix-4.29-mw-bug.patch @@ -0,0 +1,55 @@ +From bab9a7cd299deb1b62f2c7b7e6f9c530379ea004 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Nov 2023 19:27:47 +0100 +Subject: hwmon: (acpi_power_meter) Fix 4.29 MW bug + +From: Armin Wolf + +[ Upstream commit 1fefca6c57fb928d2131ff365270cbf863d89c88 ] + +The ACPI specification says: + +"If an error occurs while obtaining the meter reading or if the value +is not available then an Integer with all bits set is returned" + +Since the "integer" is 32 bits in case of the ACPI power meter, +userspace will get a power reading of 2^32 * 1000 miliwatts (~4.29 MW) +in case of such an error. This was discovered due to a lm_sensors +bugreport (https://github.com/lm-sensors/lm-sensors/issues/460). +Fix this by returning -ENODATA instead. + +Tested-by: +Fixes: de584afa5e18 ("hwmon driver for ACPI 4.0 power meters") +Signed-off-by: Armin Wolf +Link: https://lore.kernel.org/r/20231124182747.13956-1-W_Armin@gmx.de +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/acpi_power_meter.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c +index e40d8907853bf..1d1f68a895080 100644 +--- a/drivers/hwmon/acpi_power_meter.c ++++ b/drivers/hwmon/acpi_power_meter.c +@@ -45,6 +45,7 @@ ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); + #define POWER_METER_CAN_NOTIFY (1 << 3) + #define POWER_METER_IS_BATTERY (1 << 8) + #define UNKNOWN_HYSTERESIS 0xFFFFFFFF ++#define UNKNOWN_POWER 0xFFFFFFFF + + #define METER_NOTIFY_CONFIG 0x80 + #define METER_NOTIFY_TRIP 0x81 +@@ -356,6 +357,9 @@ static ssize_t show_power(struct device *dev, + update_meter(resource); + mutex_unlock(&resource->lock); + ++ if (resource->power == UNKNOWN_POWER) ++ return -ENODATA; ++ + return sprintf(buf, "%llu\n", resource->power * 1000); + } + +-- +2.42.0 + diff --git a/queue-4.14/rdma-bnxt_re-correct-module-description-string.patch b/queue-4.14/rdma-bnxt_re-correct-module-description-string.patch new file mode 100644 index 00000000000..b2b30598691 --- /dev/null +++ b/queue-4.14/rdma-bnxt_re-correct-module-description-string.patch @@ -0,0 +1,38 @@ +From 80aba715032942826532c81ea42b5f489e7b75a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Nov 2023 00:29:47 -0800 +Subject: RDMA/bnxt_re: Correct module description string + +From: Kalesh AP + +[ Upstream commit 422b19f7f006e813ee0865aadce6a62b3c263c42 ] + +The word "Driver" is repeated twice in the "modinfo bnxt_re" +output description. Fix it. + +Fixes: 1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver") +Signed-off-by: Kalesh AP +Signed-off-by: Selvin Xavier +Link: https://lore.kernel.org/r/1700555387-6277-1-git-send-email-selvin.xavier@broadcom.com +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c +index 7d00b6a53ed8c..bd14f6daee52d 100644 +--- a/drivers/infiniband/hw/bnxt_re/main.c ++++ b/drivers/infiniband/hw/bnxt_re/main.c +@@ -70,7 +70,7 @@ static char version[] = + BNXT_RE_DESC " v" ROCE_DRV_MODULE_VERSION "\n"; + + MODULE_AUTHOR("Eddie Wai "); +-MODULE_DESCRIPTION(BNXT_RE_DESC " Driver"); ++MODULE_DESCRIPTION(BNXT_RE_DESC); + MODULE_LICENSE("Dual BSD/GPL"); + + /* globals */ +-- +2.42.0 + diff --git a/queue-4.14/scsi-be2iscsi-fix-a-memleak-in-beiscsi_init_wrb_hand.patch b/queue-4.14/scsi-be2iscsi-fix-a-memleak-in-beiscsi_init_wrb_hand.patch new file mode 100644 index 00000000000..872827ca344 --- /dev/null +++ b/queue-4.14/scsi-be2iscsi-fix-a-memleak-in-beiscsi_init_wrb_hand.patch @@ -0,0 +1,38 @@ +From cc8af58ac48f04b75c1e62174ec5a80759771121 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Nov 2023 16:19:41 +0800 +Subject: scsi: be2iscsi: Fix a memleak in beiscsi_init_wrb_handle() + +From: Dinghao Liu + +[ Upstream commit 235f2b548d7f4ac5931d834f05d3f7f5166a2e72 ] + +When an error occurs in the for loop of beiscsi_init_wrb_handle(), we +should free phwi_ctxt->be_wrbq before returning an error code to prevent +potential memleak. + +Fixes: a7909b396ba7 ("[SCSI] be2iscsi: Fix dynamic CID allocation Mechanism in driver") +Signed-off-by: Dinghao Liu +Link: https://lore.kernel.org/r/20231123081941.24854-1-dinghao.liu@zju.edu.cn +Reviewed-by: Mike Christie +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/be2iscsi/be_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c +index a1fd8a7fa48c3..ddaf2b57d9349 100644 +--- a/drivers/scsi/be2iscsi/be_main.c ++++ b/drivers/scsi/be2iscsi/be_main.c +@@ -2687,6 +2687,7 @@ static int beiscsi_init_wrb_handle(struct beiscsi_hba *phba) + kfree(pwrb_context->pwrb_handle_base); + kfree(pwrb_context->pwrb_handle_basestd); + } ++ kfree(phwi_ctxt->be_wrbq); + return -ENOMEM; + } + +-- +2.42.0 + diff --git a/queue-4.14/series b/queue-4.14/series index 7baba6b829d..21f4ea7032a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -3,3 +3,7 @@ tg3-increment-tx_dropped-in-tg3_tso_bug.patch drm-amdgpu-correct-chunk_ptr-to-a-pointer-to-chunk.patch net-hns-fix-fake-link-up-on-xge-port.patch tcp-do-not-accept-ack-of-bytes-we-never-sent.patch +rdma-bnxt_re-correct-module-description-string.patch +hwmon-acpi_power_meter-fix-4.29-mw-bug.patch +tracing-fix-a-warning-when-allocating-buffered-event.patch +scsi-be2iscsi-fix-a-memleak-in-beiscsi_init_wrb_hand.patch diff --git a/queue-4.14/tracing-fix-a-warning-when-allocating-buffered-event.patch b/queue-4.14/tracing-fix-a-warning-when-allocating-buffered-event.patch new file mode 100644 index 00000000000..e913993fe8f --- /dev/null +++ b/queue-4.14/tracing-fix-a-warning-when-allocating-buffered-event.patch @@ -0,0 +1,83 @@ +From 6f2159793b3b354430042bd7f01a926a19830938 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Dec 2023 17:17:35 +0100 +Subject: tracing: Fix a warning when allocating buffered events fails + +From: Petr Pavlu + +[ Upstream commit 34209fe83ef8404353f91ab4ea4035dbc9922d04 ] + +Function trace_buffered_event_disable() produces an unexpected warning +when the previous call to trace_buffered_event_enable() fails to +allocate pages for buffered events. + +The situation can occur as follows: + +* The counter trace_buffered_event_ref is at 0. + +* The soft mode gets enabled for some event and + trace_buffered_event_enable() is called. The function increments + trace_buffered_event_ref to 1 and starts allocating event pages. + +* The allocation fails for some page and trace_buffered_event_disable() + is called for cleanup. + +* Function trace_buffered_event_disable() decrements + trace_buffered_event_ref back to 0, recognizes that it was the last + use of buffered events and frees all allocated pages. + +* The control goes back to trace_buffered_event_enable() which returns. + The caller of trace_buffered_event_enable() has no information that + the function actually failed. + +* Some time later, the soft mode is disabled for the same event. + Function trace_buffered_event_disable() is called. It warns on + "WARN_ON_ONCE(!trace_buffered_event_ref)" and returns. + +Buffered events are just an optimization and can handle failures. Make +trace_buffered_event_enable() exit on the first failure and left any +cleanup later to when trace_buffered_event_disable() is called. + +Link: https://lore.kernel.org/all/20231127151248.7232-2-petr.pavlu@suse.com/ +Link: https://lkml.kernel.org/r/20231205161736.19663-3-petr.pavlu@suse.com + +Fixes: 0fc1b09ff1ff ("tracing: Use temp buffer when filtering events") +Signed-off-by: Petr Pavlu +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Sasha Levin +--- + kernel/trace/trace.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index c851b6fe45b27..a5ae1e8cdf49b 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -2202,8 +2202,11 @@ void trace_buffered_event_enable(void) + for_each_tracing_cpu(cpu) { + page = alloc_pages_node(cpu_to_node(cpu), + GFP_KERNEL | __GFP_NORETRY, 0); +- if (!page) +- goto failed; ++ /* This is just an optimization and can handle failures */ ++ if (!page) { ++ pr_err("Failed to allocate event buffer\n"); ++ break; ++ } + + event = page_address(page); + memset(event, 0, sizeof(*event)); +@@ -2217,10 +2220,6 @@ void trace_buffered_event_enable(void) + WARN_ON_ONCE(1); + preempt_enable(); + } +- +- return; +- failed: +- trace_buffered_event_disable(); + } + + static void enable_trace_buffered_event(void *data) +-- +2.42.0 +