diff options
| author | Jesper Juhl <jj@chaosbits.net> | 2012-05-23 16:58:49 +0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-05-23 16:58:49 +0400 |
| commit | eb3d5cc67a525df5115c1dc1c0ff8a111bda70e4 (patch) | |
| tree | 8897cf5aea12cea6d521d49525e642c7727ecd53 /scripts | |
| parent | 6101167727932a929e37fb8a6eeb68bdbf54d58e (diff) | |
| download | linux-eb3d5cc67a525df5115c1dc1c0ff8a111bda70e4.tar.xz | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mod/modpost.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index c4e7d1510f9d..ea0eaca597b9 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -337,17 +337,20 @@ static void sym_update_crc(const char *name, struct module *mod, void *grab_file(const char *filename, unsigned long *size) { struct stat st; - void *map; + void *map = MAP_FAILED; int fd; fd = open(filename, O_RDONLY); - if (fd < 0 || fstat(fd, &st) != 0) + if (fd < 0) return NULL; + if (fstat(fd, &st)) + goto failed; *size = st.st_size; map = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); - close(fd); +failed: + close(fd); if (map == MAP_FAILED) return NULL; return map; |