mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From e4631fd5c3c3c3710636dfdf9657bdb188bec51d Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 18 Dec 2023 11:49:36 +0000
|
|
Subject: [PATCH 0799/1085] input: edt-ft5x06: Correct prefix length in
|
|
snprintf
|
|
|
|
snprintf takes the length of the array that we can print into,
|
|
and has to fit the NULL terminator in there too.
|
|
Printing the prefix is generally "12-3456 " which is 8 desired
|
|
characters (the length of EDT_NAME_PREFIX_LEN) and the NULL.
|
|
The space is therefore being truncated to fit the NULL in.
|
|
|
|
Increase the length snprintf is allowed to use.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/input/touchscreen/edt-ft5x06.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/input/touchscreen/edt-ft5x06.c
|
|
+++ b/drivers/input/touchscreen/edt-ft5x06.c
|
|
@@ -938,7 +938,7 @@ static int edt_ft5x06_ts_identify(struct
|
|
char *model_name = tsdata->name;
|
|
char *fw_version = tsdata->fw_version;
|
|
|
|
- snprintf(model_name, EDT_NAME_PREFIX_LEN, "%s ", dev_name(&client->dev));
|
|
+ snprintf(model_name, EDT_NAME_PREFIX_LEN + 1, "%s ", dev_name(&client->dev));
|
|
model_name += strlen(model_name);
|
|
|
|
/* see what we find if we assume it is a M06 *
|