diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2013-12-12 13:14:50 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-12-12 13:14:52 -0500 |
| commit | 8d74ab767d0f97258fed40f2f2d862227545bcea (patch) | |
| tree | 79df8c848859ce5060a1b13ad6c84f60e8ea3bca | |
| parent | b2778bcb8c37705ea97fee58199446d83dbda927 (diff) | |
| download | android_external_e2fsprogs-8d74ab767d0f97258fed40f2f2d862227545bcea.tar.gz android_external_e2fsprogs-8d74ab767d0f97258fed40f2f2d862227545bcea.tar.bz2 android_external_e2fsprogs-8d74ab767d0f97258fed40f2f2d862227545bcea.zip | |
libext2fs: check return values
Fix up a few places where we ignore return values.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | lib/ext2fs/flushb.c | 2 | ||||
| -rw-r--r-- | lib/ext2fs/icount.c | 2 | ||||
| -rw-r--r-- | lib/ext2fs/imager.c | 7 | ||||
| -rw-r--r-- | lib/ext2fs/mkjournal.c | 4 | ||||
| -rw-r--r-- | lib/ext2fs/punch.c | 7 |
5 files changed, 19 insertions, 3 deletions
diff --git a/lib/ext2fs/flushb.c b/lib/ext2fs/flushb.c index ac8923cb..98821fc7 100644 --- a/lib/ext2fs/flushb.c +++ b/lib/ext2fs/flushb.c @@ -70,7 +70,7 @@ errcode_t ext2fs_sync_device(int fd, int flushb) #warning BLKFLSBUF not defined #endif #ifdef FDFLUSH - ioctl (fd, FDFLUSH, 0); /* In case this is a floppy */ + return ioctl(fd, FDFLUSH, 0); /* In case this is a floppy */ #elif defined(__linux__) #warning FDFLUSH not defined #endif diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c index 84b74a9a..c5ebf744 100644 --- a/lib/ext2fs/icount.c +++ b/lib/ext2fs/icount.c @@ -193,6 +193,8 @@ errcode_t ext2fs_create_icount_tdb(ext2_filsys fs, char *tdb_dir, uuid_unparse(fs->super->s_uuid, uuid); sprintf(fn, "%s/%s-icount-XXXXXX", tdb_dir, uuid); fd = mkstemp(fn); + if (fd < 0) + return fd; /* * This is an overestimate of the size that we will need; the diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c index 7f3b25b5..378a3c88 100644 --- a/lib/ext2fs/imager.c +++ b/lib/ext2fs/imager.c @@ -66,6 +66,7 @@ errcode_t ext2fs_image_inode_write(ext2_filsys fs, int fd, int flags) blk64_t blk; ssize_t actual; errcode_t retval; + off_t r; buf = malloc(fs->blocksize * BUF_BLOCKS); if (!buf) @@ -97,7 +98,11 @@ errcode_t ext2fs_image_inode_write(ext2_filsys fs, int fd, int flags) blk++; left--; cp += fs->blocksize; - lseek(fd, fs->blocksize, SEEK_CUR); + r = lseek(fd, fs->blocksize, SEEK_CUR); + if (r < 0) { + retval = errno; + goto errout; + } continue; } /* Find non-zero blocks */ diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c index 2afd3b7c..1d5b1a75 100644 --- a/lib/ext2fs/mkjournal.c +++ b/lib/ext2fs/mkjournal.c @@ -520,8 +520,10 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t num_blocks, int flags) #if HAVE_EXT2_IOCTLS fd = open(jfile, O_RDONLY); if (fd >= 0) { - ioctl(fd, EXT2_IOC_SETFLAGS, &f); + retval = ioctl(fd, EXT2_IOC_SETFLAGS, &f); close(fd); + if (retval) + return retval; } #endif #endif diff --git a/lib/ext2fs/punch.c b/lib/ext2fs/punch.c index 790a0ad8..ceec3367 100644 --- a/lib/ext2fs/punch.c +++ b/lib/ext2fs/punch.c @@ -192,6 +192,13 @@ static errcode_t ext2fs_punch_extent(ext2_filsys fs, ext2_ino_t ino, retval = ext2fs_extent_open2(fs, ino, inode, &handle); if (retval) return retval; + /* + * Find the extent closest to the start of the punch range. We don't + * check the return value because _goto() sets the current node to the + * next-lowest extent if 'start' is in a hole, and doesn't set a + * current node if there was a real error reading the extent tree. + * In that case, _get() will error out. + */ ext2fs_extent_goto(handle, start); retval = ext2fs_extent_get(handle, EXT2_EXTENT_CURRENT, &extent); if (retval) |