• Linus Torvalds's avatar
    Merge tag 'apparmor-pr-2018-11-01' of... · d81f50bd
    Linus Torvalds authored
    Merge tag 'apparmor-pr-2018-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
    
    Pull apparmor updates from John Johansen:
     "Features/Improvements:
       - replace spin_is_locked() with lockdep
       - add base support for secmark labeling and matching
    
      Cleanups:
       - clean an indentation issue, remove extraneous space
       - remove no-op permission check in policy_unpack
       - fix checkpatch missing spaces error in Parse secmark policy
       - fix network performance issue in aa_label_sk_perm
    
      Bug fixes:
       - add #ifdef checks for secmark filtering
       - fix an error code in __aa_create_ns()
       - don't try to replace stale label in ptrace checks
       - fix failure to audit context info in build_change_hat
       - check buffer bounds when mapping permissions mask
       - fully initialize aa_perms struct when answering userspace query
       - fix uninitialized value in aa_split_fqname"
    
    * tag 'apparmor-pr-2018-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
      apparmor: clean an indentation issue, remove extraneous space
      apparmor: fix checkpatch error in Parse secmark policy
      apparmor: add #ifdef checks for secmark filtering
      apparmor: Fix uninitialized value in aa_split_fqname
      apparmor: don't try to replace stale label in ptraceme check
      apparmor: Replace spin_is_locked() with lockdep
      apparmor: Allow filtering based on secmark policy
      apparmor: Parse secmark policy
      apparmor: Add a wildcard secid
      apparmor: don't try to replace stale label in ptrace access check
      apparmor: Fix network performance issue in aa_label_sk_perm
    d81f50bd
secid.c 3.6 KB