From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 15 Dec 2021 13:57:54 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v5.4.167~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75e7f05d4e406a631db36654e8deecd0ecb93e9b;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	hwmon-dell-smm-fix-warning-on-proc-i8k-creation-error.patch
---

diff --git a/queue-5.4/hwmon-dell-smm-fix-warning-on-proc-i8k-creation-error.patch b/queue-5.4/hwmon-dell-smm-fix-warning-on-proc-i8k-creation-error.patch
new file mode 100644
index 00000000000..14af3f38e24
--- /dev/null
+++ b/queue-5.4/hwmon-dell-smm-fix-warning-on-proc-i8k-creation-error.patch
@@ -0,0 +1,53 @@
+From dbd3e6eaf3d813939b28e8a66e29d81cdc836445 Mon Sep 17 00:00:00 2001
+From: Armin Wolf <W_Armin@gmx.de>
+Date: Fri, 12 Nov 2021 18:14:40 +0100
+Subject: hwmon: (dell-smm) Fix warning on /proc/i8k creation error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Armin Wolf <W_Armin@gmx.de>
+
+commit dbd3e6eaf3d813939b28e8a66e29d81cdc836445 upstream.
+
+The removal function is called regardless of whether
+/proc/i8k was created successfully or not, the later
+causing a WARN() on module removal.
+Fix that by only registering the removal function
+if /proc/i8k was created successfully.
+
+Tested on a Inspiron 3505.
+
+Fixes: 039ae58503f3 ("hwmon: Allow to compile dell-smm-hwmon driver without /proc/i8k")
+Signed-off-by: Armin Wolf <W_Armin@gmx.de>
+Acked-by: Pali Rohár <pali@kernel.org>
+Link: https://lore.kernel.org/r/20211112171440.59006-1-W_Armin@gmx.de
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hwmon/dell-smm-hwmon.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/hwmon/dell-smm-hwmon.c
++++ b/drivers/hwmon/dell-smm-hwmon.c
+@@ -588,15 +588,18 @@ static const struct file_operations i8k_
+ 	.unlocked_ioctl	= i8k_ioctl,
+ };
+ 
++static struct proc_dir_entry *entry;
++
+ static void __init i8k_init_procfs(void)
+ {
+ 	/* Register the proc entry */
+-	proc_create("i8k", 0, NULL, &i8k_fops);
++	entry = proc_create("i8k", 0, NULL, &i8k_fops);
+ }
+ 
+ static void __exit i8k_exit_procfs(void)
+ {
+-	remove_proc_entry("i8k", NULL);
++	if (entry)
++		remove_proc_entry("i8k", NULL);
+ }
+ 
+ #else
diff --git a/queue-5.4/series b/queue-5.4/series
index fae14e036fd..bd1bdde8828 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -10,3 +10,4 @@ tracing-fix-a-kmemleak-false-positive-in-tracing_map.patch
 kvm-x86-ignore-sparse-banks-size-for-an-all-cpus-non-sparse-ipi-req.patch
 selinux-fix-race-condition-when-computing-ocontext-sids.patch
 bpf-fix-integer-overflow-in-argument-calculation-for-bpf_map_area_alloc.patch
+hwmon-dell-smm-fix-warning-on-proc-i8k-creation-error.patch