rebase patches on top of Ubuntu-4.15.0-32.35

[pve-kernel.git] / patches / kernel / 0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch

diff --git a/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch b/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch
index 23c1c505107305ba38de887035e9d14e4a02b8d1..dc8c5ea7be76e96cdf5ab41107fe79b5c0a6e50a 100644 (file)
--- a/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch
+++ b/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch
@@ -19,7 +19,7 @@ Signed-off-by: John Johansen <john.johansen@canonical.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
-index a7b3f681b80e..eafad30a78d7 100644
+index 068a9f471f77..23f3d16d6b85 100644
 --- a/security/apparmor/lib.c
 +++ b/security/apparmor/lib.c
 @@ -327,7 +327,7 @@ void aa_compute_perms(struct aa_dfa *dfa, unsigned int state,
@@ -31,6 +31,3 @@ index a7b3f681b80e..eafad30a78d7 100644
        perms->audit |= map_other(dfa_other_audit(dfa, state));
        perms->quiet |= map_other(dfa_other_quiet(dfa, state));
  //    perms->xindex = dfa_user_xindex(dfa, state);
--- 
-2.17.1
-