From: Daniel Dunbar <daniel@zuster.org>
Date: Tue, 25 Mar 2008 23:51:47 +0000 (+0100)
Subject: mkdir -Z x d: don't segfault when diagnosing invalid context "x" (tiny change)
X-Git-Tag: v6.11~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72d052896a9092b811961a8f3e6ca5d151a59be5;p=platform%2Fupstream%2Fcoreutils.git

mkdir -Z x d: don't segfault when diagnosing invalid context "x" (tiny change)

* src/mkdir.c (main): Use "scontext", not NULL optarg in diagnostic.
Reported by Cristian Cadar, Daniel Dunbar and Dawson Engler.
* NEWS: Mention the bug fix.
---

diff --git a/NEWS b/NEWS
index 43d80ca..5250ed8 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ GNU coreutils NEWS                                    -*- outline -*-
   ls no longer segfaults on files in /proc when linked with an older version
   of libselinux.  E.g., ls -l /proc/sys would dereference a NULL pointer.
 
+  "mkdir -Z x dir" no longer segfaults when diagnosing invalid context "x"
+
   mv would mistakenly unlink a destination file before calling rename,
   when the destination had two or more hard links.  It no longer does that.
   [bug introduced in coreutils-5.3.0]
diff --git a/src/mkdir.c b/src/mkdir.c
index 3952594..d3d76ad 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -192,7 +192,7 @@ main (int argc, char **argv)
   if (scontext && setfscreatecon (scontext) < 0)
     error (EXIT_FAILURE, errno,
 	   _("failed to set default file creation context to %s"),
-	   quote (optarg));
+	   quote (scontext));
 
   if (options.make_ancestor_function || specified_mode)
     {