1
0
Fork 0
alistair23-linux/security/apparmor
Linus Torvalds 168e153d5e Merge branch 'work.icache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs inode freeing updates from Al Viro:
 "Introduction of separate method for RCU-delayed part of
  ->destroy_inode() (if any).

  Pretty much as posted, except that destroy_inode() stashes
  ->free_inode into the victim (anon-unioned with ->i_fops) before
  scheduling i_callback() and the last two patches (sockfs conversion
  and folding struct socket_wq into struct socket) are excluded - that
  pair should go through netdev once davem reopens his tree"

* 'work.icache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (58 commits)
  orangefs: make use of ->free_inode()
  shmem: make use of ->free_inode()
  hugetlb: make use of ->free_inode()
  overlayfs: make use of ->free_inode()
  jfs: switch to ->free_inode()
  fuse: switch to ->free_inode()
  ext4: make use of ->free_inode()
  ecryptfs: make use of ->free_inode()
  ceph: use ->free_inode()
  btrfs: use ->free_inode()
  afs: switch to use of ->free_inode()
  dax: make use of ->free_inode()
  ntfs: switch to ->free_inode()
  securityfs: switch to ->free_inode()
  apparmor: switch to ->free_inode()
  rpcpipe: switch to ->free_inode()
  bpf: switch to ->free_inode()
  mqueue: switch to ->free_inode()
  ufs: switch to ->free_inode()
  coda: switch to ->free_inode()
  ...
2019-05-07 10:57:05 -07:00
..
include audit/stable-5.1 PR 20190305 2019-03-07 12:20:11 -08:00
.gitignore apparmor: add base infastructure for socket mediation 2018-03-13 17:25:48 -07:00
Kconfig apparmor: Remove SECURITY_APPARMOR_BOOTPARAM_VALUE 2019-01-08 13:18:43 -08:00
Makefile apparmor: add base infastructure for socket mediation 2018-03-13 17:25:48 -07:00
apparmorfs.c apparmor: switch to ->free_inode() 2019-05-01 22:43:26 -04:00
audit.c audit: remove unused actx param from audit_rule_match 2019-01-31 23:00:15 -05:00
capability.c LSM: generalize flag passing to security_capable 2019-01-10 14:16:06 -08:00
crypto.c crypto: shash - remove shash_desc::flags 2019-04-25 15:38:12 +08:00
domain.c Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 2019-03-07 11:44:01 -08:00
file.c apparmor: Replace spin_is_locked() with lockdep 2018-10-03 06:29:22 -07:00
ipc.c LSM: generalize flag passing to security_capable 2019-01-10 14:16:06 -08:00
label.c apparmor: fixup secid map conversion to using IDR 2018-06-07 01:50:49 -07:00
lib.c apparmor: Fix uninitialized value in aa_split_fqname 2018-10-03 06:29:22 -07:00
lsm.c apparmor: Restore Y/N in /sys for apparmor's "enabled" 2019-04-10 04:24:48 -07:00
match.c apparmor: fix typo "traverse" 2018-05-03 00:50:12 -07:00
mount.c vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled 2018-12-20 16:32:56 +00:00
net.c apparmor: add #ifdef checks for secmark filtering 2018-10-12 17:09:56 -07:00
nulldfa.in apparmor: cleanup add proper line wrapping to nulldfa.in 2018-02-09 11:30:01 -08:00
path.c apparmor: Move path lookup to using preallocated buffers 2017-06-08 11:29:34 -07:00
policy.c apparmor: fix checkpatch error in Parse secmark policy 2018-11-01 22:28:17 -07:00
policy_ns.c apparmor: fix an error code in __aa_create_ns() 2018-08-21 16:24:56 -07:00
policy_unpack.c apparmor: fix double free when unpack of secmark rules fails 2019-03-12 03:48:02 -07:00
procattr.c apparmor: move context.h to cred.h 2018-02-09 11:30:01 -08:00
resource.c LSM: generalize flag passing to security_capable 2019-01-10 14:16:06 -08:00
secid.c + Features/Improvements 2018-11-02 10:04:26 -07:00
stacksplitdfa.in apparmor: use the dfa to do label parse string splitting 2018-02-09 11:30:01 -08:00
task.c AppArmor: Abstract use of cred security blob 2019-01-08 13:18:44 -08:00