2023-11-06 14:12:41

by Florian Eckert

[permalink] [raw]
Subject: [Patch v2] leds: ledtrig-tty: free allocated ttyname buffer on deactivate

The ttyname buffer for the ledtrig_tty_data struct is allocated in the
sysfs ttyname_store() function. This buffer must be released on trigger
deactivation. This was missing and is thus a memory leak.

While we are at it, the tty handler in the ledtrig_tty_data struct should
also be returned in case of the trigger deactivation call.

Cc: [email protected]
Fixes: fd4a641ac88f ("leds: trigger: implement a tty trigger")
Signed-off-by: Florian Eckert <[email protected]>
---
v1 -> v2:
Add Cc: tag

drivers/leds/trigger/ledtrig-tty.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/leds/trigger/ledtrig-tty.c b/drivers/leds/trigger/ledtrig-tty.c
index 8ae0d2d284af..3e69a7bde928 100644
--- a/drivers/leds/trigger/ledtrig-tty.c
+++ b/drivers/leds/trigger/ledtrig-tty.c
@@ -168,6 +168,10 @@ static void ledtrig_tty_deactivate(struct led_classdev *led_cdev)

cancel_delayed_work_sync(&trigger_data->dwork);

+ kfree(trigger_data->ttyname);
+ tty_kref_put(trigger_data->tty);
+ trigger_data->tty = NULL;
+
kfree(trigger_data);
}

--
2.30.2


2023-11-06 14:51:06

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: [Patch v2] leds: ledtrig-tty: free allocated ttyname buffer on deactivate

On Mon, Nov 06, 2023 at 03:12:05PM +0100, Florian Eckert wrote:
> The ttyname buffer for the ledtrig_tty_data struct is allocated in the
> sysfs ttyname_store() function. This buffer must be released on trigger
> deactivation. This was missing and is thus a memory leak.
>
> While we are at it, the tty handler in the ledtrig_tty_data struct should
> also be returned in case of the trigger deactivation call.
>
> Cc: [email protected]
> Fixes: fd4a641ac88f ("leds: trigger: implement a tty trigger")
> Signed-off-by: Florian Eckert <[email protected]>

I already provided that to v1, but my reply and the v2 crossed, so I'm
forwarding my tag to this v2:

Reviewed-by: Uwe Kleine-K?nig <[email protected]>

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |


Attachments:
(No filename) (918.00 B)
signature.asc (499.00 B)
Download all attachments