mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
modpost: Stop grab_file() from leaking filedescriptors if fstat() fails
In case the open() call succeeds but the subsequent fstat() call fails, then we'll return without close()'ing the filedescriptor. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
parent
6101167727
commit
eb3d5cc67a
1 changed files with 6 additions and 3 deletions
|
@ -337,17 +337,20 @@ static void sym_update_crc(const char *name, struct module *mod,
|
||||||
void *grab_file(const char *filename, unsigned long *size)
|
void *grab_file(const char *filename, unsigned long *size)
|
||||||
{
|
{
|
||||||
struct stat st;
|
struct stat st;
|
||||||
void *map;
|
void *map = MAP_FAILED;
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
fd = open(filename, O_RDONLY);
|
fd = open(filename, O_RDONLY);
|
||||||
if (fd < 0 || fstat(fd, &st) != 0)
|
if (fd < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
if (fstat(fd, &st))
|
||||||
|
goto failed;
|
||||||
|
|
||||||
*size = st.st_size;
|
*size = st.st_size;
|
||||||
map = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
|
map = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
|
||||||
close(fd);
|
|
||||||
|
|
||||||
|
failed:
|
||||||
|
close(fd);
|
||||||
if (map == MAP_FAILED)
|
if (map == MAP_FAILED)
|
||||||
return NULL;
|
return NULL;
|
||||||
return map;
|
return map;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue