Skip to contentSkip to conversation

leds: ledtrig-tty: free allocated ttyname buffer on deactivate

PATCH Applied Florian Eckert 3 participants 3 messages Nov 27, 2023

Subsystems (2)
Stable branch LED
lore
Share & tools
lore

Florian Eckert

author
#0 lore raw

PATCH v3 1/1 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]>
Reviewed-by Uwe Kleine-König <[email protected]>

---
v1 -> v2:
Add Cc: tag
v2 -> v3:
Add Reviewed-by and resend witout changes

 drivers/leds/trigger/ledtrig-tty.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/leds/trigger/ledtrig-tty.c +4 -0
index 8ae0d2d284af..3e69a7bde928 100644
@@ -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);
 }
Signature · 1 line
2.30.2
maintainer Reviewed-by on v3 1/1
#1 lore raw
Quoted 11 lines · Florian Eckert

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]>
Reviewed-by Uwe Kleine-König <[email protected]>
Reviewed-by Greg Kroah-Hartman <[email protected]>
maintainer Applied
#2 lore raw

Re: (subset) [Patch v3 1/1] leds: ledtrig-tty: free allocated ttyname buffer on deactivate

In reply to Florian Eckert
Quoted 8 lines · Florian Eckert

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.

[...]

Applied, thanks!

[1/1] leds: ledtrig-tty: free allocated ttyname buffer on deactivate

      commit: dcc9a56adb91830b14e4838de95d3e85db35a0f4

--
Lee Jones [李琼斯]