diff options
author | Damien Miller <djm@mindrot.org> | 2011-01-02 21:43:59 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-01-02 21:43:59 +1100 |
commit | 4a06f9271fe5341c942232015add391cee366b68 (patch) | |
tree | 12382e6c6a226dad9553552343c92e03096d2da3 /loginrec.c | |
parent | 928362dc0312f5d258da0a98ab48f35bfaa368f1 (diff) | |
download | openssh-git-4a06f9271fe5341c942232015add391cee366b68.tar.gz |
- (djm) [loginrec.c] Fix some fd leaks on error paths. ok dtucker
Diffstat (limited to 'loginrec.c')
-rw-r--r-- | loginrec.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -873,11 +873,13 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut) pos = (off_t)tty * sizeof(struct utmp); if ((ret = lseek(fd, pos, SEEK_SET)) == -1) { logit("%s: lseek: %s", __func__, strerror(errno)); + close(fd); return (0); } if (ret != pos) { logit("%s: Couldn't seek to tty %d slot in %s", __func__, tty, UTMP_FILE); + close(fd); return (0); } /* @@ -893,16 +895,20 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut) if ((ret = lseek(fd, pos, SEEK_SET)) == -1) { logit("%s: lseek: %s", __func__, strerror(errno)); + close(fd); return (0); } if (ret != pos) { logit("%s: Couldn't seek to tty %d slot in %s", __func__, tty, UTMP_FILE); + close(fd); return (0); } if (atomicio(vwrite, fd, ut, sizeof(*ut)) != sizeof(*ut)) { logit("%s: error writing %s: %s", __func__, UTMP_FILE, strerror(errno)); + close(fd); + return (0); } close(fd); @@ -1206,7 +1212,7 @@ wtmp_get_entry(struct logininfo *li) close (fd); return (0); } - if ( wtmp_islogin(li, &ut) ) { + if (wtmp_islogin(li, &ut) ) { found = 1; /* * We've already checked for a time in struct @@ -1502,6 +1508,7 @@ lastlog_openseek(struct logininfo *li, int *fd, int filemode) if (lseek(*fd, offset, SEEK_SET) != offset) { logit("%s: %s->lseek(): %s", __func__, lastlog_file, strerror(errno)); + close(*fd); return (0); } } |