summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-07 17:21:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-07 17:21:59 -0700
commita0127afbed65b7b9f8a486c557017eafb4d4c0fc (patch)
tree13cc11b0eb15128270e323c4053922d39a7343c7
parent332a2e1244bd08b9e3ecd378028513396a004a24 (diff)
parentc540521bba5d2f24bd2c0417157bfaf8b85e2eee (diff)
downloadlinux-3.10-a0127afbed65b7b9f8a486c557017eafb4d4c0fc.tar.gz
linux-3.10-a0127afbed65b7b9f8a486c557017eafb4d4c0fc.tar.bz2
linux-3.10-a0127afbed65b7b9f8a486c557017eafb4d4c0fc.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security docs update from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: security: Minor improvements to no_new_privs documentation
-rw-r--r--Documentation/prctl/no_new_privs.txt7
-rw-r--r--include/linux/prctl.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/prctl/no_new_privs.txt b/Documentation/prctl/no_new_privs.txt
index cb705ec69ab..f7be84fba91 100644
--- a/Documentation/prctl/no_new_privs.txt
+++ b/Documentation/prctl/no_new_privs.txt
@@ -25,6 +25,13 @@ bits will no longer change the uid or gid; file capabilities will not
add to the permitted set, and LSMs will not relax constraints after
execve.
+To set no_new_privs, use prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0).
+
+Be careful, though: LSMs might also not tighten constraints on exec
+in no_new_privs mode. (This means that setting up a general-purpose
+service launcher to set no_new_privs before execing daemons may
+interfere with LSM-based sandboxing.)
+
Note that no_new_privs does not prevent privilege changes that do not
involve execve. An appropriately privileged task can still call
setuid(2) and receive SCM_RIGHTS datagrams.
diff --git a/include/linux/prctl.h b/include/linux/prctl.h
index 3988012255d..289760f424a 100644
--- a/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@ -141,6 +141,8 @@
* Changing LSM security domain is considered a new privilege. So, for example,
* asking selinux for a specific new context (e.g. with runcon) will result
* in execve returning -EPERM.
+ *
+ * See Documentation/prctl/no_new_privs.txt for more details.
*/
#define PR_SET_NO_NEW_PRIVS 38
#define PR_GET_NO_NEW_PRIVS 39