diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2021-02-19 14:33:06 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-10 09:27:55 +0100 |
| commit | 1487e7bae809d73461940a6ef8c1ffc7c4faa0d3 (patch) | |
| tree | 25f6e9edae325a8af3e9d57fa98b28f6a30879a1 /drivers/leds | |
| parent | Linux 5.12-rc2 (diff) | |
| download | linux-dev-1487e7bae809d73461940a6ef8c1ffc7c4faa0d3.tar.xz linux-dev-1487e7bae809d73461940a6ef8c1ffc7c4faa0d3.zip | |
leds: trigger: Fix error path to not unlock the unlocked mutex
ttyname is allocated before the mutex is taken, so it must not be
unlocked in the error path.
Fixes: fd4a641ac88f ("leds: trigger: implement a tty trigger")
Reported-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210219133307.4840-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/trigger/ledtrig-tty.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/leds/trigger/ledtrig-tty.c b/drivers/leds/trigger/ledtrig-tty.c index d2ab6ab080ac..af61281dc6a1 100644 --- a/drivers/leds/trigger/ledtrig-tty.c +++ b/drivers/leds/trigger/ledtrig-tty.c @@ -51,10 +51,8 @@ static ssize_t ttyname_store(struct device *dev, if (size) { ttyname = kmemdup_nul(buf, size, GFP_KERNEL); - if (!ttyname) { - ret = -ENOMEM; - goto out_unlock; - } + if (!ttyname) + return -ENOMEM; } else { ttyname = NULL; } @@ -69,7 +67,6 @@ static ssize_t ttyname_store(struct device *dev, trigger_data->ttyname = ttyname; -out_unlock: mutex_unlock(&trigger_data->mutex); if (ttyname && !running) |