]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Feb 2025 12:34:55 +0000 (13:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Feb 2025 12:34:55 +0000 (13:34 +0100)
added patches:
regmap-irq-add-missing-kfree.patch

queue-5.4/regmap-irq-add-missing-kfree.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/regmap-irq-add-missing-kfree.patch b/queue-5.4/regmap-irq-add-missing-kfree.patch
new file mode 100644 (file)
index 0000000..55e73ff
--- /dev/null
@@ -0,0 +1,40 @@
+From 32ffed055dcee17f6705f545b069e44a66067808 Mon Sep 17 00:00:00 2001
+From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
+Date: Wed, 5 Feb 2025 00:43:43 +0000
+Subject: regmap-irq: Add missing kfree()
+
+From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
+
+commit 32ffed055dcee17f6705f545b069e44a66067808 upstream.
+
+Add kfree() for "d->main_status_buf" to the error-handling path to prevent
+a memory leak.
+
+Fixes: a2d21848d921 ("regmap: regmap-irq: Add main status register support")
+Cc: stable@vger.kernel.org  # v5.1+
+Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
+Link: https://patch.msgid.link/20250205004343.14413-1-jiashengjiangcool@gmail.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/base/regmap/regmap-irq.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/base/regmap/regmap-irq.c
++++ b/drivers/base/regmap/regmap-irq.c
+@@ -808,6 +808,7 @@ err_alloc:
+       kfree(d->wake_buf);
+       kfree(d->mask_buf_def);
+       kfree(d->mask_buf);
++      kfree(d->main_status_buf);
+       kfree(d->status_buf);
+       kfree(d->status_reg_buf);
+       kfree(d);
+@@ -854,6 +855,7 @@ void regmap_del_irq_chip(int irq, struct
+       kfree(d->wake_buf);
+       kfree(d->mask_buf_def);
+       kfree(d->mask_buf);
++      kfree(d->main_status_buf);
+       kfree(d->status_reg_buf);
+       kfree(d->status_buf);
+       kfree(d);
index 47462e5eb3c1abb789599098297ffa7f91deab2a..bbd53912eb677c156ae23ce6fc4cc840fc2745c7 100644 (file)
@@ -189,3 +189,4 @@ serial-8250-fix-fifo-underflow-on-flush.patch
 alpha-align-stack-for-page-fault-and-user-unaligned-trap-handlers.patch
 gpio-stmpe-check-return-value-of-stmpe_reg_read-in-stmpe_gpio_irq_sync_unlock.patch
 partitions-mac-fix-handling-of-bogus-partition-table.patch
+regmap-irq-add-missing-kfree.patch