diff options
author | Daniel Dunbar <daniel@zuster.org> | 2008-03-26 00:51:47 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-03-26 00:57:29 +0100 |
commit | 72d052896a9092b811961a8f3e6ca5d151a59be5 (patch) | |
tree | 167375f90c42facec9c79d62d2d3d0372ef256b5 | |
parent | f7d1c59c224f81a8bab5fa2afcaf815988f50467 (diff) | |
download | coreutils-72d052896a9092b811961a8f3e6ca5d151a59be5.tar.xz |
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.
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | src/mkdir.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 395259413..d3d76ad48 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) { |