vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

libext2fs: fix memory and fd leak in error path of unix_open() 

Fix a potential memory leak reported by Li Xi.  In addition, there
were possible error cases where the file descriptor would not be
properly closed, so fix those as well while we're at it.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reported-by:  Li Xi <pkuelelixi@gmail.com>
debian-1.42.9
Theodore Ts'o 2012-12-16 20:14:20 -05:00
parent 1564150d31
commit 4e0bb5eb74
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ext2fs/unix_io.c
View File

@ -505,6 +505,7 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
memset(data, 0, sizeof(struct unix_private_data));
data->magic = EXT2_ET_MAGIC_UNIX_IO_CHANNEL;
data->io_stats.num_fields = 2;
data->dev = -1;
open_flags = (flags & IO_FLAG_RW) ? O_RDWR : O_RDONLY;
if (flags & IO_FLAG_EXCLUSIVE)
@ -575,7 +576,6 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
/* Is the block device actually writable? */
error = ioctl(data->dev, BLKROGET, &readonly);
if (!error && readonly) {
close(data->dev);
retval = EPERM;
goto cleanup;
}
@ -621,11 +621,17 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
cleanup:
if (data) {
if (data->dev >= 0)
close(data->dev);
free_cache(data);
ext2fs_free_mem(&data);
}
if (io)
if (io) {
if (io->name) {
ext2fs_free_mem(&io->name);
}
ext2fs_free_mem(&io);
}
return retval;
}