Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 28eba5bf9d4bf3ba4d58d985abf3a2903b7f2125

Authored by Michael LeMay
Committed by Linus Torvalds
1 parent 76b67ed9dc
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] selinux: inherit /proc/self/attr/keycreate across fork 

Update SELinux to cause the keycreate process attribute held in
/proc/self/attr/keycreate to be inherited across a fork and reset upon
execve.  This is consistent with the handling of the other process
attributes provided by SELinux and also makes it simpler to adapt logon
programs to properly handle the keycreate attribute.

Signed-off-by: Michael LeMay <mdlemay@epoch.ncsc.mil>
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

security/selinux/hooks.c
Diff comments   View file @ 28eba5b
... ... @@ -1532,8 +1532,9 @@
1532 1532 /* Default to the current task SID. */
1533 1533 bsec->sid = tsec->sid;
1534 1534  
1535   - /* Reset create and sockcreate SID on execve. */
  1535 + /* Reset fs, key, and sock SIDs on execve. */
1536 1536 tsec->create_sid = 0;
  1537 + tsec->keycreate_sid = 0;
1537 1538 tsec->sockcreate_sid = 0;
1538 1539  
1539 1540 if (tsec->exec_sid) {
1540 1541  
... ... @@ -2586,9 +2587,10 @@
2586 2587 tsec2->osid = tsec1->osid;
2587 2588 tsec2->sid = tsec1->sid;
2588 2589  
2589   - /* Retain the exec, create, and sock SIDs across fork */
  2590 + /* Retain the exec, fs, key, and sock SIDs across fork */
2590 2591 tsec2->exec_sid = tsec1->exec_sid;
2591 2592 tsec2->create_sid = tsec1->create_sid;
  2593 + tsec2->keycreate_sid = tsec1->keycreate_sid;
2592 2594 tsec2->sockcreate_sid = tsec1->sockcreate_sid;
2593 2595  
2594 2596 /* Retain ptracer SID across fork, if any.