mcb: patches for 7.2
Johannes Thumshirn
maintainercover mcb: patches for 7.2
From: Johannes Thumshirn <[email protected]>
Hi Greg,
Here's a mcb patch for 7.2 (or 7.1 if you feel like pulling it in for 7.1) from Filip fixing a slab out of bounds read when copying the MCB FPGA name into the bus->name.
Filip Jensen (1):
mcb: fix kasan read slab out of bounds
drivers/mcb/mcb-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.53.0
Johannes Thumshirn
maintainerPATCH 1/1 mcb: fix kasan read slab out of bounds
From: Filip Jensen <[email protected]>
Fixes the following kasan bug report reproducible when probing the driver:
slab-out-of-bounds in string_nocheck lib/vsprintf.c:655 slab-out-of-bounds in string+0x396/0x440 lib/vsprintf.c:737
Read of size 1 at addr ffff88810dd32f94 by task modprobe/661
It is caused for passing snprintf a not null terminated string as a parameter but in the format string expecting one ("%s"), thus making it read pass the valid data.
Another solution could be giving a length to the snprintf parameter:
snprintf(bus->name,CHAMELEON_FILENAME_LEN +
1,"%.*s",CHAMELEON_FILENAME_LEN,header->filename);
However, this solution seems less readable and since there is no need to format the input, apart from converting it into a right C string, a simple memcpy is here proposed.
--- drivers/mcb/mcb-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mcb/mcb-parse.c +2 -2
@@ -200,8 +200,8 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, bus->revision = header->revision; bus->model = header->model; bus->minor = header->minor; -snprintf (bus->name,CHAMELEON_FILENAME_LEN +1 ,"%s" , - header->filename); +memcpy (bus->name, header->filename,CHAMELEON_FILENAME_LEN ); + bus->name[CHAMELEON_FILENAME_LEN ] ='\0' ; bar_count =chameleon_get_bar (&p, mapbase, &cb);if (bar_count <0 ) {
Signature · 1 line
2.53.0