All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Robin van der Gracht <robin@protonic.nl>,
	Rob Herring <robh+dt@kernel.org>, Miguel Ojeda <ojeda@kernel.org>,
	Paul Burton <paulburton@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Pavel Machek <pavel@ucw.cz>
Cc: devicetree@vger.kernel.org, linux-leds@vger.kernel.org,
	linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
	Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v2 03/18] auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string
Date: Fri, 25 Jun 2021 14:58:47 +0200	[thread overview]
Message-ID: <20210625125902.1162428-4-geert@linux-m68k.org> (raw)
In-Reply-To: <20210625125902.1162428-1-geert@linux-m68k.org>

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: 0cad855fbd083ee5 ("auxdisplay: img-ascii-lcd: driver for simple ASCII LCD displays")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Untested with img-ascii-lcd, but triggered with my initial version of
linedisp.

v2:
  - No changes.
---
 drivers/auxdisplay/img-ascii-lcd.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c
index 1cce409ce5cacbc8..e33ce0151cdfd150 100644
--- a/drivers/auxdisplay/img-ascii-lcd.c
+++ b/drivers/auxdisplay/img-ascii-lcd.c
@@ -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;
-- 
2.25.1


  parent reply	other threads:[~2021-06-25 12:59 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25 12:58 [PATCH v2 00/18] auxdisplay: ht16k33: Add character display support Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 01/18] uapi: Add <linux/map_to_14segment.h> Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 02/18] dt-bindings: auxdisplay: ht16k33: Document Adafruit segment displays Geert Uytterhoeven
2021-07-14 20:36   ` Rob Herring
2021-07-15  7:12     ` Geert Uytterhoeven
2021-07-15 14:32       ` Rob Herring
2021-07-15 15:06         ` Geert Uytterhoeven
2021-06-25 12:58 ` Geert Uytterhoeven [this message]
2021-06-25 12:58 ` [PATCH v2 04/18] auxdisplay: img-ascii-lcd: Add helper variable dev Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 05/18] auxdisplay: img-ascii-lcd: Convert device attribute to sysfs_emit() Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 06/18] auxdisplay: Extract character line display core support Geert Uytterhoeven
2021-06-25 23:35   ` kernel test robot
2021-06-25 23:35     ` kernel test robot
2021-06-28 10:17     ` Geert Uytterhoeven
2021-06-28 10:17       ` Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 07/18] auxdisplay: linedisp: Use kmemdup_nul() helper Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 08/18] auxdisplay: linedisp: Add support for changing scroll rate Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 09/18] auxdisplay: ht16k33: Connect backlight to fbdev Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 10/18] auxdisplay: ht16k33: Use HT16K33_FB_SIZE in ht16k33_initialize() Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 11/18] auxdisplay: ht16k33: Remove unneeded error check in keypad probe() Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 12/18] auxdisplay: ht16k33: Convert to simple i2c probe function Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 13/18] auxdisplay: ht16k33: Add helper variable dev Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 14/18] auxdisplay: ht16k33: Move delayed work Geert Uytterhoeven
2021-06-25 12:58 ` [PATCH v2 15/18] auxdisplay: ht16k33: Extract ht16k33_brightness_set() Geert Uytterhoeven
2021-06-25 12:59 ` [PATCH v2 16/18] auxdisplay: ht16k33: Extract frame buffer probing Geert Uytterhoeven
2021-06-25 12:59 ` [PATCH v2 17/18] auxdisplay: ht16k33: Add support for segment displays Geert Uytterhoeven
2021-06-25 12:59 ` [PATCH v2 18/18] auxdisplay: ht16k33: Add segment display LED support Geert Uytterhoeven
2021-06-25 20:39   ` Marek Behun
2021-06-25 20:40     ` Marek Behun
2021-06-28  9:21       ` Geert Uytterhoeven
2021-06-28  9:21     ` Geert Uytterhoeven
2021-06-28 10:15       ` Marek Behun
2021-06-28 15:33         ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210625125902.1162428-4-geert@linux-m68k.org \
    --to=geert@linux-m68k.org \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-leds@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=ojeda@kernel.org \
    --cc=paulburton@kernel.org \
    --cc=pavel@ucw.cz \
    --cc=robh+dt@kernel.org \
    --cc=robin@protonic.nl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.