• Linus Torvalds's avatar
    Merge tag 'apparmor-pr-2017-11-21' of... · 26064dea
    Linus Torvalds authored
    Merge tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
    
    Pull apparmor updates from John Johansen:
     "No features this time, just minor cleanups and bug fixes.
    
      Cleanups:
       - fix spelling mistake: "resoure" -> "resource"
       - remove unused redundant variable stop
       - Fix bool initialization/comparison
    
      Bug Fixes:
       - initialized returned struct aa_perms
       - fix leak of null profile name if profile allocation fails
       - ensure that undecidable profile attachments fail
       - fix profile attachment for special unconfined profiles
       - fix locking when creating a new complain profile.
       - fix possible recursive lock warning in __aa_create_ns"
    
    * tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
      apparmor: fix possible recursive lock warning in __aa_create_ns
      apparmor: fix locking when creating a new complain profile.
      apparmor: fix profile attachment for special unconfined profiles
      apparmor: ensure that undecidable profile attachments fail
      apparmor: fix leak of null profile name if profile allocation fails
      apparmor: remove unused redundant variable stop
      apparmor: Fix bool initialization/comparison
      apparmor: initialized returned struct aa_perms
      apparmor: fix spelling mistake: "resoure" -> "resource"
    26064dea
lsm.c 30.6 KB