| Message ID | 1316206180-6375-24-git-send-email-sandeen@redhat.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Sep 16, 2011 at 03:49:38PM -0500, Eric Sandeen wrote: > These reflect either file descriptors which aren't tested > for failure, or closures of fd's which may have failed. > > In setup_tdb(), test for failure of mkstemp and return > without trying to open the file (again). > > In reserve_stdio_fds, rather than closing the "extra" > fd == 3 due to the way the loop is written, just > don't go that far by using while (fd <= 2). > > In logsave, it forks and retries forever if open fails, > but at least make coverity happy by explicitly not > trying to close a negative file descriptor. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Applied, thanks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c index ace5b4d..ca73c31 100644 --- a/e2fsck/dirinfo.c +++ b/e2fsck/dirinfo.c @@ -62,6 +62,10 @@ static void setup_tdb(e2fsck_t ctx, ext2_ino_t num_dirs) uuid_unparse(ctx->fs->super->s_uuid, uuid); sprintf(db->tdb_fn, "%s/%s-dirinfo-XXXXXX", tdb_dir, uuid); fd = mkstemp(db->tdb_fn); + if (fd < 0) { + db->tdb = NULL; + return; + } db->tdb = tdb_open(db->tdb_fn, 0, TDB_CLEAR_IF_FIRST, O_RDWR | O_CREAT | O_TRUNC, 0600); close(fd); diff --git a/e2fsck/unix.c b/e2fsck/unix.c index bc18d41..a787d39 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -542,14 +542,16 @@ static int e2fsck_update_progress(e2fsck_t ctx, int pass, #define PATH_SET "PATH=/sbin" +/* + * Make sure 0,1,2 file descriptors are open, so that we don't open + * the filesystem using the same file descriptor as stdout or stderr. + */ static void reserve_stdio_fds(void) { - int fd; + int fd = 0; - while (1) { + while (fd <= 2) { fd = open("/dev/null", O_RDWR); - if (fd > 2) - break; if (fd < 0) { fprintf(stderr, _("ERROR: Couldn't open " "/dev/null (%s)\n"), @@ -557,7 +559,6 @@ static void reserve_stdio_fds(void) break; } } - close(fd); } #ifdef HAVE_SIGNAL_H diff --git a/misc/logsave.c b/misc/logsave.c index 74e09f7..17457a5 100644 --- a/misc/logsave.c +++ b/misc/logsave.c @@ -325,7 +325,8 @@ int main(int argc, char **argv) write_all(outfd, outbuf, outbufsize); free(outbuf); } - close(outfd); + if (outfd >= 0) + close(outfd); exit(rc); }
These reflect either file descriptors which aren't tested for failure, or closures of fd's which may have failed. In setup_tdb(), test for failure of mkstemp and return without trying to open the file (again). In reserve_stdio_fds, rather than closing the "extra" fd == 3 due to the way the loop is written, just don't go that far by using while (fd <= 2). In logsave, it forks and retries forever if open fails, but at least make coverity happy by explicitly not trying to close a negative file descriptor. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- e2fsck/dirinfo.c | 4 ++++ e2fsck/unix.c | 11 ++++++----- misc/logsave.c | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-)