hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

can: softing: Fix potential memory leak in softing_load_fw() 

Do not leak memory by updating pointer with potentially NULL realloc return value.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Alexey Khoroshilov 2012-08-08 19:15:01 +04:00 committed by Marc Kleine-Budde
parent a0dfb2634e
commit ef813c412c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/can/softing/softing_fw.c
View File

@ -150,7 +150,7 @@ int softing_load_fw(const char *file, struct softing *card,
const uint8_t *mem, *end, *dat; const uint8_t *mem, *end, *dat;
uint16_t type, len; uint16_t type, len;
uint32_t addr; uint32_t addr;
uint8_t *buf = NULL; uint8_t *buf = NULL, *new_buf;
int buflen = 0; int buflen = 0;
int8_t type_end = 0; int8_t type_end = 0;
@ -199,11 +199,12 @@ int softing_load_fw(const char *file, struct softing *card,
if (len > buflen) { if (len > buflen) {
/* align buflen */ /* align buflen */
buflen = (len + (1024-1)) & ~(1024-1); buflen = (len + (1024-1)) & ~(1024-1);
buf = krealloc(buf, buflen, GFP_KERNEL); new_buf = krealloc(buf, buflen, GFP_KERNEL);
if (!buf) { if (!new_buf) {
ret = -ENOMEM; ret = -ENOMEM;
goto failed; goto failed;
} }
buf = new_buf;
} }
/* verify record data */ /* verify record data */
memcpy_fromio(buf, &dpram[addr + offset], len); memcpy_fromio(buf, &dpram[addr + offset], len);