diff options
| author | Linus Torvalds | 2016-11-21 15:27:41 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-11-21 15:27:41 -0800 |
| commit | 3b404a519815b9820f73f1ecf404e5546c9270ba (patch) | |
| tree | aaa2975ab06a0f6f24bf21906577f5f065c48d98 /drivers/ata/pata_jmicron.c | |
| parent | 8d1a2408efa6a5e75f4c968351a240425c3fa0e5 (diff) | |
| parent | 3d40658c977769ce2138f286cf131537bf68bdfe (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull apparmor bugfix from James Morris:
"This has a fix for a policy replacement bug that is fairly serious for
apache mod_apparmor users, as it results in the wrong policy being
applied on an network facing service"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
apparmor: fix change_hat not finding hat after policy replacement
Diffstat (limited to 'drivers/ata/pata_jmicron.c')
0 files changed, 0 insertions, 0 deletions