Commit 923190d32de4428afbea5e5773be86bea60a9925

Authored by Stephen Smalley
Committed by Paul Moore
1 parent 4093a84439

selinux: fix inode security list corruption

sb_finish_set_opts() can race with inode_free_security()
when initializing inode security structures for inodes
created prior to initial policy load or by the filesystem
during ->mount().   This appears to have always been
a possible race, but commit 3dc91d4 ("SELinux:  Fix possible
NULL pointer dereference in selinux_inode_permission()")
made it more evident by immediately reusing the unioned
list/rcu element  of the inode security structure for call_rcu()
upon an inode_free_security().  But the underlying issue
was already present before that commit as a possible use-after-free
of isec.

Shivnandan Kumar reported the list corruption and proposed
a patch to split the list and rcu elements out of the union
as separate fields of the inode_security_struct so that setting
the rcu element would not affect the list element.  However,
this would merely hide the issue and not truly fix the code.

This patch instead moves up the deletion of the list entry
prior to dropping the sbsec->isec_lock initially.  Then,
if the inode is dropped subsequently, there will be no further
references to the isec.

Reported-by: Shivnandan Kumar <shivnandan.k@samsung.com>
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Cc: stable@vger.kernel.org
Signed-off-by: Paul Moore <pmoore@redhat.com>

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

security/selinux/hooks.c
... ... @@ -481,6 +481,7 @@
481 481 list_entry(sbsec->isec_head.next,
482 482 struct inode_security_struct, list);
483 483 struct inode *inode = isec->inode;
  484 + list_del_init(&isec->list);
484 485 spin_unlock(&sbsec->isec_lock);
485 486 inode = igrab(inode);
486 487 if (inode) {
... ... @@ -489,7 +490,6 @@
489 490 iput(inode);
490 491 }
491 492 spin_lock(&sbsec->isec_lock);
492   - list_del_init(&isec->list);
493 493 goto next_inode;
494 494 }
495 495 spin_unlock(&sbsec->isec_lock);