* [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
@ 2021-12-14 21:00 Armin Wolf
2021-12-15 13:54 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Armin Wolf @ 2021-12-14 21:00 UTC (permalink / raw)
To: pali; +Cc: stable
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 calling the removal function
if /proc/i8k was created successfully.
Since the original patch depends on the driver
registering a platform device, the backported patch
stores the return value of proc_create() and only
calls proc_remove_entry() on exit if proc_create()
was successful.
Tested on a Inspiron 3505 for kernel 5.10.
Cc: <stable@vger.kernel.org> # 5.10.x
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
drivers/hwmon/dell-smm-hwmon.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index 63b74e781c5d..87f401100466 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -603,15 +603,18 @@ static const struct proc_ops i8k_proc_ops = {
.proc_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_proc_ops);
+ entry = proc_create("i8k", 0, NULL, &i8k_proc_ops);
}
static void __exit i8k_exit_procfs(void)
{
- remove_proc_entry("i8k", NULL);
+ if (entry)
+ remove_proc_entry("i8k", NULL);
}
#else
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
2021-12-14 21:00 [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error Armin Wolf
@ 2021-12-15 13:54 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2021-12-15 13:54 UTC (permalink / raw)
To: Armin Wolf; +Cc: pali, stable
On Tue, Dec 14, 2021 at 10:00:47PM +0100, Armin Wolf wrote:
> 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 calling the removal function
> if /proc/i8k was created successfully.
>
> Since the original patch depends on the driver
> registering a platform device, the backported patch
> stores the return value of proc_create() and only
> calls proc_remove_entry() on exit if proc_create()
> was successful.
>
> Tested on a Inspiron 3505 for kernel 5.10.
>
> Cc: <stable@vger.kernel.org> # 5.10.x
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
> drivers/hwmon/dell-smm-hwmon.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
All now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
@ 2021-12-14 21:06 Armin Wolf
0 siblings, 0 replies; 6+ messages in thread
From: Armin Wolf @ 2021-12-14 21:06 UTC (permalink / raw)
To: pali; +Cc: stable
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 calling the removal function
if /proc/i8k was created successfully.
Since the original patch depends on the driver
registering a platform device, the backported patch
stores the return value of proc_create() and only
calls proc_remove_entry() on exit if proc_create()
was successful.
Tested on a Inspiron 3505 for kernels 4.19/4.9.
Cc: <stable@vger.kernel.org> # 5.4.x
Cc: <stable@vger.kernel.org> # 4.x.x
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
drivers/hwmon/dell-smm-hwmon.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index 35c00420d855..2eaed0008f37 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -588,15 +588,18 @@ static const struct file_operations i8k_fops = {
.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
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
2021-11-12 17:14 Armin Wolf
2021-11-12 17:49 ` Pali Rohár
@ 2021-11-14 16:52 ` Guenter Roeck
1 sibling, 0 replies; 6+ messages in thread
From: Guenter Roeck @ 2021-11-14 16:52 UTC (permalink / raw)
To: Armin Wolf; +Cc: pali, jdelvare, linux-hwmon, linux-kernel
On Fri, Nov 12, 2021 at 06:14:40PM +0100, Armin Wolf wrote:
> 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>
Applied.
Thanks,
Guenter
> ---
> drivers/hwmon/dell-smm-hwmon.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> --
> 2.30.2
>
> diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
> index eaace478f508..5596c211f38d 100644
> --- a/drivers/hwmon/dell-smm-hwmon.c
> +++ b/drivers/hwmon/dell-smm-hwmon.c
> @@ -627,10 +627,9 @@ static void __init i8k_init_procfs(struct device *dev)
> {
> struct dell_smm_data *data = dev_get_drvdata(dev);
>
> - /* Register the proc entry */
> - proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data);
> -
> - devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> + /* Only register exit function if creation was successful */
> + if (proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data))
> + devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> }
>
> #else
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
2021-11-12 17:14 Armin Wolf
@ 2021-11-12 17:49 ` Pali Rohár
2021-11-14 16:52 ` Guenter Roeck
1 sibling, 0 replies; 6+ messages in thread
From: Pali Rohár @ 2021-11-12 17:49 UTC (permalink / raw)
To: Armin Wolf; +Cc: jdelvare, linux, linux-hwmon, linux-kernel
On Friday 12 November 2021 18:14:40 Armin Wolf wrote:
> 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>
> ---
> drivers/hwmon/dell-smm-hwmon.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
> index eaace478f508..5596c211f38d 100644
> --- a/drivers/hwmon/dell-smm-hwmon.c
> +++ b/drivers/hwmon/dell-smm-hwmon.c
> @@ -627,10 +627,9 @@ static void __init i8k_init_procfs(struct device *dev)
> {
> struct dell_smm_data *data = dev_get_drvdata(dev);
>
> - /* Register the proc entry */
> - proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data);
> -
> - devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> + /* Only register exit function if creation was successful */
> + if (proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data))
> + devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> }
>
> #else
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
@ 2021-11-12 17:14 Armin Wolf
2021-11-12 17:49 ` Pali Rohár
2021-11-14 16:52 ` Guenter Roeck
0 siblings, 2 replies; 6+ messages in thread
From: Armin Wolf @ 2021-11-12 17:14 UTC (permalink / raw)
To: pali; +Cc: jdelvare, linux, linux-hwmon, linux-kernel
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>
---
drivers/hwmon/dell-smm-hwmon.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index eaace478f508..5596c211f38d 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -627,10 +627,9 @@ static void __init i8k_init_procfs(struct device *dev)
{
struct dell_smm_data *data = dev_get_drvdata(dev);
- /* Register the proc entry */
- proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data);
-
- devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
+ /* Only register exit function if creation was successful */
+ if (proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data))
+ devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
}
#else
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-15 13:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-14 21:00 [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error Armin Wolf
2021-12-15 13:54 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2021-12-14 21:06 Armin Wolf
2021-11-12 17:14 Armin Wolf
2021-11-12 17:49 ` Pali Rohár
2021-11-14 16:52 ` Guenter Roeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.