[src/trunk]: src/bin/pax Another missing mkdir() race pointed out by chuq. Fa...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c813cc4ecd9c
branches:  trunk
changeset: 584418:c813cc4ecd9c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 16 16:48:18 2005 +0000

description:
Another missing mkdir() race pointed out by chuq. Factor out the mkdir code.

diffstat:

 bin/pax/ar_subs.c   |  27 +++++++++++++++++++++++++--
 bin/pax/extern.h    |   3 ++-
 bin/pax/file_subs.c |  19 ++++---------------
 bin/pax/options.c   |  23 +++++------------------
 4 files changed, 36 insertions(+), 36 deletions(-)

diffs (172 lines):

diff -r 4217dbfb0a75 -r c813cc4ecd9c bin/pax/ar_subs.c
--- a/bin/pax/ar_subs.c Fri Sep 16 15:26:47 2005 +0000
+++ b/bin/pax/ar_subs.c Fri Sep 16 16:48:18 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ar_subs.c,v 1.42 2005/05/22 17:41:50 christos Exp $    */
+/*     $NetBSD: ar_subs.c,v 1.43 2005/09/16 16:48:18 christos Exp $    */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_subs.c  8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ar_subs.c,v 1.42 2005/05/22 17:41:50 christos Exp $");
+__RCSID("$NetBSD: ar_subs.c,v 1.43 2005/09/16 16:48:18 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -124,6 +124,29 @@
 }
 #endif
 
+/*
+ * mkdir(), but if we failed, check if someone else made it for us
+ * already and don't error out.
+ */
+int
+domkdir(const char *fname, mode_t mode)
+{
+       int error;
+       struct stat sb;
+
+       if ((error = mkdir(fname, mode)) != -1 || errno != EEXIST)
+               return error;
+
+       error = errno;
+
+       if (stat(fname, &sb) == 0 && S_ISDIR(sb.st_mode))
+               return 0;
+
+       errno = error;
+
+       return -1;
+}
+
 static int
 path_check(ARCHD *arcn, int level)
 {
diff -r 4217dbfb0a75 -r c813cc4ecd9c bin/pax/extern.h
--- a/bin/pax/extern.h  Fri Sep 16 15:26:47 2005 +0000
+++ b/bin/pax/extern.h  Fri Sep 16 16:48:18 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.48 2005/04/24 01:45:04 christos Exp $     */
+/*     $NetBSD: extern.h,v 1.49 2005/09/16 16:48:18 christos Exp $     */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -85,6 +85,7 @@
 int updatepath(void);
 int dochdir(const char *);
 int fdochdir(int);
+int domkdir(const char *, mode_t);
 void list(void);
 void extract(void);
 void append(void);
diff -r 4217dbfb0a75 -r c813cc4ecd9c bin/pax/file_subs.c
--- a/bin/pax/file_subs.c       Fri Sep 16 15:26:47 2005 +0000
+++ b/bin/pax/file_subs.c       Fri Sep 16 16:48:18 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: file_subs.c,v 1.55 2005/09/13 20:09:55 christos Exp $  */
+/*     $NetBSD: file_subs.c,v 1.56 2005/09/16 16:48:18 christos Exp $  */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)file_subs.c        8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: file_subs.c,v 1.55 2005/09/13 20:09:55 christos Exp $");
+__RCSID("$NetBSD: file_subs.c,v 1.56 2005/09/16 16:48:18 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -464,18 +464,7 @@
                                        nm = target;
                                }
                        }
-                       res = mkdir(nm, file_mode);
-                       if (res == -1 && errno == EEXIST) {
-                               /*
-                                * Something's in the way.
-                                * If it's a directory, say we're done.
-                                */
-                               if (stat(nm, &sb) == 0 &&
-                                   S_ISDIR(sb.st_mode)) {
-                                       res = 0;
-                                       break;
-                               }
-                       }
+                       res = domkdir(nm, file_mode);
 badlink:
                        if (ign)
                                res = 0;
@@ -730,7 +719,7 @@
                 * the path fails at this point, see if we can create the
                 * needed directory and continue on
                 */
-               if (mkdir(name, S_IRWXU | S_IRWXG | S_IRWXO) < 0) {
+               if (domkdir(name, S_IRWXU | S_IRWXG | S_IRWXO) == -1) {
                        *spt = '/';
                        retval = -1;
                        break;
diff -r 4217dbfb0a75 -r c813cc4ecd9c bin/pax/options.c
--- a/bin/pax/options.c Fri Sep 16 15:26:47 2005 +0000
+++ b/bin/pax/options.c Fri Sep 16 16:48:18 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.91 2005/09/13 20:09:55 christos Exp $    */
+/*     $NetBSD: options.c,v 1.92 2005/09/16 16:48:18 christos Exp $    */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.91 2005/09/13 20:09:55 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.92 2005/09/16 16:48:18 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -1322,9 +1322,8 @@
 mkpath(path)
        char *path;
 {
-       struct stat sb;
        char *slash;
-       int done = 0, sverrno;
+       int done = 0;
 
        slash = path;
 
@@ -1335,20 +1334,8 @@
                done = (*slash == '\0');
                *slash = '\0';
 
-               if (stat(path, &sb) == -1) {
-                       if ((sverrno = errno) != ENOENT)
-                               goto out;
-                       if (mkdir(path, 0777) == -1) {
-                               sverrno = errno;
-                               /* Check again, to avoid races */
-                               if (stat(path, &sb) == -1
-                                   || !S_ISDIR(sb.st_mode))
-                                       goto out;
-                       }
-               } else if (!S_ISDIR(sb.st_mode)) {
-                       sverrno = ENOTDIR;
+               if (domkdir(path, 0777) == -1)
                        goto out;
-               }
 
                if (!done)
                        *slash = '/';
@@ -1357,7 +1344,7 @@
        return 0;
 out:
        /* Can't create or or not a directory */
-       syswarn(1, sverrno, "Cannot create directory `%s'", path);
+       syswarn(1, errno, "Cannot create directory `%s'", path);
        return -1;
 }