upas/fs: fix potential filedescriptor leaks

diff --git a/sys/src/cmd/upas/fs/imap4.c b/sys/src/cmd/upas/fs/imap4.c
index 7ddf33d3ba5ca9f4a78c660bbeb22264896f501f..714a3e7d055609ac6f7ba1c3ca7e0ca8080e0bbe 100644 (file)
--- a/sys/src/cmd/upas/fs/imap4.c
+++ b/sys/src/cmd/upas/fs/imap4.c
@@ -394,32 +394,32 @@ imaperrstr(char *host, char *port)
 }
 
 static int
-starttls(Imap *imap, TLSconn *connp)
+starttls(Imap *imap)
 {
        int sfd;
        uchar digest[SHA1dlen];
+       TLSconn conn;
 
-       memset(connp, 0, sizeof *connp);
-       sfd = tlsClient(imap->fd, connp);
+       memset(&conn, 0, sizeof(conn));
+       sfd = tlsClient(imap->fd, &conn);
        if(sfd < 0) {
                werrstr("tlsClient: %r");
                return -1;
        }
-       if(connp->cert==nil || connp->certlen <= 0) {
-               close(sfd);
+       imap->fd = sfd;
+       free(conn.sessionID);
+       if(conn.cert==nil || conn.certlen <= 0) {
                werrstr("server did not provide TLS certificate");
                return -1;
        }
-       sha1(connp->cert, connp->certlen, digest, nil);
+       sha1(conn.cert, conn.certlen, digest, nil);
+       free(conn.cert);
        if(!imap->thumb || !okThumbprint(digest, imap->thumb)){
-               close(sfd);
                fmtinstall('H', encodefmt);
                werrstr("server certificate %.*H not recognized",
                        SHA1dlen, digest);
                return -1;
        }
-       close(imap->fd);
-       imap->fd = sfd;
        return sfd;
 }
 
@@ -430,8 +430,6 @@ static char*
 imap4dial(Imap *imap)
 {
        char *err, *port;
-       int sfd;
-       TLSconn conn;
 
        if(imap->fd >= 0){
                imap4cmd(imap, "noop");
@@ -450,35 +448,22 @@ imap4dial(Imap *imap)
                return imaperrstr(imap->host, port);
 
        if(imap->mustssl){
-               sfd = starttls(imap, &conn);
-               free(conn.cert);
-               free(conn.sessionID);
-               if(sfd < 0)
-                       return imaperrstr(imap->host, port);
-               if(imap->debug){
-                       char fn[128];
-                       int fd;
-
-                       snprint(fn, sizeof fn, "%s/ctl", conn.dir);
-                       fd = open(fn, ORDWR);
-                       if(fd < 0)
-                               fprint(2, "opening ctl: %r\n");
-                       else {
-                               if(fprint(fd, "debug") < 0)
-                                       fprint(2, "writing ctl: %r\n");
-                               close(fd);
-                       }
+               if(starttls(imap) < 0){
+                       err = imaperrstr(imap->host, port);
+                       goto Out;
                }
        }
        Binit(&imap->bin, imap->fd, OREAD);
        Binit(&imap->bout, imap->fd, OWRITE);
-
-       if(err = imap4login(imap)) {
-               close(imap->fd);
-               return err;
+       err = imap4login(imap);
+Out:
+       if(err != nil){
+               if(imap->fd >= 0){
+                       close(imap->fd);
+                       imap->fd = -1;
+               }
        }
-
-       return nil;
+       return err;
 }
 
 //
@@ -487,9 +472,12 @@ imap4dial(Imap *imap)
 static void
 imap4hangup(Imap *imap)
 {
+       if(imap->fd < 0)
+               return;
        imap4cmd(imap, "LOGOUT");
        imap4resp(imap);
        close(imap->fd);
+       imap->fd = -1;
 }
 
 //

diff --git a/sys/src/cmd/upas/fs/pop3.c b/sys/src/cmd/upas/fs/pop3.c
index 257fc8970156332300694b5b843795a269a9e249..ac8cb3cd002cac71794d61464980a102c6536629 100644 (file)
--- a/sys/src/cmd/upas/fs/pop3.c
+++ b/sys/src/cmd/upas/fs/pop3.c
@@ -261,23 +261,29 @@ pop3dial(Pop *pop)
 {
        char *err;
 
+       if(pop->fd >= 0){
+               close(pop->fd);
+               pop->fd = -1;
+       }
        if((pop->fd = dial(netmkaddr(pop->host, "net", pop->needssl ? "pop3s" : "pop3"), 0, 0, 0)) < 0)
                return geterrstr();
 
        if(pop->needssl){
                if((err = pop3pushtls(pop)) != nil)
-                       return err;
+                       goto Out;
        }else{
                Binit(&pop->bin, pop->fd, OREAD);
                Binit(&pop->bout, pop->fd, OWRITE);
        }
-
-       if(err = pop3login(pop)) {
-               close(pop->fd);
-               return err;
+       err = pop3login(pop);
+Out:
+       if(err != nil){
+               if(pop->fd >= 0){
+                       close(pop->fd);
+                       pop->fd = -1;
+               }
        }
-
-       return nil;
+       return err;
 }
 
 //
@@ -286,9 +292,12 @@ pop3dial(Pop *pop)
 static void
 pop3hangup(Pop *pop)
 {
+       if(pop->fd < 0)
+               return;
        pop3cmd(pop, "QUIT");
        pop3resp(pop);
        close(pop->fd);
+       pop->fd = -1;
 }
 
 //
@@ -563,12 +572,10 @@ pop3sync(Mailbox *mb, int doplumb)
        Pop *pop;
 
        pop = mb->aux;
-
        if(err = pop3dial(pop)) {
                mb->waketime = time(0) + pop->refreshtime;
                return err;
        }
-
        if((err = pop3read(pop, mb, doplumb)) == nil){
                pop3purge(pop, mb);
                mb->d->atime = mb->d->mtime = time(0);
@@ -667,6 +674,7 @@ pop3mbox(Mailbox *mb, char *path)
        }
 
        pop = emalloc(sizeof(*pop));
+       pop->fd = -1;
        pop->freep = path;
        pop->host = f[2];
        if(nf < 4)