Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-17 02:15:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stdio: fix stdio_deregister_dev()

Browse source 
When copying the name of a stdio device we must ensure that it is NUL
terminated before passing it to strcmp() to avoid a buffer overrun.

Truncating the name field leads to failure to deregister a stdio device.
When copying we must ensure that the name field sizes match.

Addresses-Coverity-ID: 350462 String not null terminated
Fixes: 5294e97832 ("stdio: extend "name" to 32 symbols")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt 2023-09-29 02:47:17 +02:00 • committed by Tom Rini
parent 6a1e0ae43e
commit 6da11cc81e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/stdio.c
View file

@ -259,7 +259,7 @@ int stdio_register(struct stdio_dev *dev)
int stdio_deregister_dev(struct stdio_dev *dev, int force)
{
struct list_head *pos;
char temp_names[3][16];
char temp_names[3][STDIO_NAME_LEN];
int i;
/* get stdio devices (ListRemoveItem changes the dev list) */
@ -272,8 +272,8 @@ int stdio_deregister_dev(struct stdio_dev *dev, int force)
/* Device is assigned -> report error */
return -EBUSY;
}
memcpy(&temp_names[i][0], stdio_devices[i]->name,
sizeof(temp_names[i]));
strlcpy(&temp_names[i][0], stdio_devices[i]->name,
sizeof(temp_names[i]));
}
list_del(&dev->list);

3
include/stdio_dev.h
View file

@ -17,6 +17,7 @@
#define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */
#define DEV_FLAGS_OUTPUT 0x00000002 /* Device can be used as output console */
#define DEV_FLAGS_DM 0x00000004 /* Device priv is a struct udevice * */
#define STDIO_NAME_LEN 32
int stdio_file_to_flags(const int file);
@ -24,7 +25,7 @@ int stdio_file_to_flags(const int file);
struct stdio_dev {
int flags; /* Device flags: input/output/system */
int ext; /* Supported extensions */
char name[32]; /* Device name */
char name[STDIO_NAME_LEN]; /* Device name */
/* GENERAL functions */