]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Input: serio-raw - fix potential serio port name truncation
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 5 Sep 2024 04:17:26 +0000 (21:17 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 4 Oct 2024 08:04:15 +0000 (01:04 -0700)
When compiling with W=1 the following warnings are triggered:

drivers/input/serio/serio_raw.c: In function ‘serio_raw_connect’:
drivers/input/serio/serio_raw.c:303:28: error: ‘%ld’ directive output may be truncated writing between 1 and 11 bytes into a region of size 7 [-Werror=format-truncation=]
  303 |                  "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));

atomic_inc_return() returns an int, so there is no reason to cast it
to long and print as such. Fix the issue by removing the cast,
printing it as unsigned decimal, and expanding the name from 16 to 20
bytes to accommodate the largest possible port number.

Link: https://lore.kernel.org/r/20240905041732.2034348-22-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/serio/serio_raw.c

index aef8301313b2c29a59dd61ac486d0ae5764ea67f..e058fef07f576a3b1820f13e7f4313c4ac43f235 100644 (file)
@@ -29,7 +29,7 @@ struct serio_raw {
        unsigned char queue[SERIO_RAW_QUEUE_LEN];
        unsigned int tail, head;
 
-       char name[16];
+       char name[20];
        struct kref kref;
        struct serio *serio;
        struct miscdevice dev;
@@ -277,7 +277,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
        }
 
        snprintf(serio_raw->name, sizeof(serio_raw->name),
-                "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
+                "serio_raw%u", atomic_inc_return(&serio_raw_no));
        kref_init(&serio_raw->kref);
        INIT_LIST_HEAD(&serio_raw->client_list);
        init_waitqueue_head(&serio_raw->wait);