Skip to contentSkip to conversation

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

PATCH Superseded Florian Eckert 2 participants 2 messages Nov 6, 2023

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

Fixes fd4a641ac88f ("leds: trigger: implement a tty trigger")

---
v1 -> v2:
Add Cc: tag

 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
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 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.

Fixes fd4a641ac88f ("leds: trigger: implement a tty trigger")

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

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |