CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-05-15 06:51:37 +02:00
Code Issues Projects Releases Wiki Activity

mknod, mkfifo: don't segfault when diagnosing invalid SELinux context

Browse Source 
Identical to the bug fixed by 72d052896a.
* src/mkfifo.c (main): Use "scontext", not NULL optarg in diagnostic.
* src/mknod.c (main): Likewise.
Reported by Cristian Cadar, Daniel Dunbar and Dawson Engler.
* tests/mkdir/selinux: Test for the above fixes.
* NEWS: Mention the fixes.
This commit is contained in:
Jim Meyering
2008-03-28 22:37:19 +01:00
parent cdb16829a6
commit eb8fa94f2c
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -13,6 +13,7 @@ GNU coreutils NEWS -*- outline -*-
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"
mkfifo and mknod would fail similarly. Now they're fixed.
mv would mistakenly unlink a destination file before calling rename,
when the destination had two or more hard links. It no longer does that.

4
src/mkfifo.c
View File

@@ -1,5 +1,5 @@
/* mkfifo -- make fifo's (named pipes)
Copyright (C) 90, 91, 1995-2007 Free Software Foundation, Inc.
Copyright (C) 90, 91, 1995-2008 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -116,7 +116,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));
newmode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
if (specified_mode)

4
src/mknod.c
View File

@@ -1,5 +1,5 @@
/* mknod -- make special files
Copyright (C) 90, 91, 1995-2007 Free Software Foundation, Inc.
Copyright (C) 90, 91, 1995-2008 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -168,7 +168,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));
/* Only check the first character, to allow mnemonic usage like
`mknod /dev/rst0 character 18 0'. */

15
tests/mkdir/selinux
View File

@@ -19,6 +19,8 @@
if test "$VERBOSE" = yes; then
set -x
mkdir --version
mkfifo --version
mknod --version
fi
. $srcdir/../envvar-check
@@ -32,7 +34,20 @@ mkdir -Z $c dir-arg 2> out && fail=1
cat <<EOF > exp || fail=1
mkdir: failed to set default file creation context to \`$c': Invalid argument
EOF
compare out exp || fail=1
# Until coreutils-6.10.150, mknod and mkfifo had the same problem:
mknod -Z $c b p 2> out && fail=1
cat <<EOF > exp || fail=1
mknod: failed to set default file creation context to \`$c': Invalid argument
EOF
compare out exp || fail=1
mkfifo -Z $c f 2> out && fail=1
cat <<EOF > exp || fail=1
mkfifo: failed to set default file creation context to \`$c': Invalid argument
EOF
compare out exp || fail=1
(exit $fail); exit $fail