mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string
[ Upstream commitafcb5a811f
] While writing an empty string to a device attribute is a no-op, and thus does not need explicit safeguards, the user can still write a single newline to an attribute file: echo > .../message If that happens, img_ascii_lcd_display() trims the newline, yielding an empty string, and causing an infinite loop in img_ascii_lcd_scroll(). Fix this by adding a check for empty strings. Clear the display in case one is encountered. Fixes:0cad855fbd
("auxdisplay: img-ascii-lcd: driver for simple ASCII LCD displays") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
e63507ea43
commit
1fa9803de9
1 changed files with 10 additions and 0 deletions
|
@ -280,6 +280,16 @@ static int img_ascii_lcd_display(struct img_ascii_lcd_ctx *ctx,
|
|||
if (msg[count - 1] == '\n')
|
||||
count--;
|
||||
|
||||
if (!count) {
|
||||
/* clear the LCD */
|
||||
devm_kfree(&ctx->pdev->dev, ctx->message);
|
||||
ctx->message = NULL;
|
||||
ctx->message_len = 0;
|
||||
memset(ctx->curr, ' ', ctx->cfg->num_chars);
|
||||
ctx->cfg->update(ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
new_msg = devm_kmalloc(&ctx->pdev->dev, count + 1, GFP_KERNEL);
|
||||
if (!new_msg)
|
||||
return -ENOMEM;
|
||||
|
|
Loading…
Reference in a new issue