- 4.7.4

diff --git a/kernel-apparmor.patch b/kernel-apparmor.patch
index 399ae313d5b93b19d4d277a31a308bc4e83f8376..29fa055308cb418f2f080ad304676bb3ca0ef6a9 100644 (file)
--- a/kernel-apparmor.patch
+++ b/kernel-apparmor.patch
@@ -598,38 +598,6 @@ index a689f10..c841b12 100644
        return 1;
  }
 
-commit e13f968d154ba9d6a2c4f82f33d3312a63430b54
-Author: John Johansen <john.johansen@canonical.com>
-Date:   Wed Dec 16 18:09:10 2015 -0800
-
-    apparmor: fix refcount race when finding a child profile
-    
-    When finding a child profile via an rcu critical section, the profile
-    may be put and scheduled for deletion after the child is found but
-    before its refcount is incremented.
-    
-    Protect against this by repeating the lookup if the profiles refcount
-    is 0 and is one its way to deletion.
-    
-    Signed-off-by: John Johansen <john.johansen@canonical.com>
-    Acked-by: Seth Arnold <seth.arnold@canonical.com>
-
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index ca402d0..7807125 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -766,7 +766,9 @@ struct aa_profile *aa_find_child(struct aa_profile *parent, const char *name)
-       struct aa_profile *profile;
- 
-       rcu_read_lock();
--      profile = aa_get_profile(__find_child(&parent->base.profiles, name));
-+      do {
-+              profile = __find_child(&parent->base.profiles, name);
-+      } while (profile && !aa_get_profile_not0(profile));
-       rcu_read_unlock();
- 
-       /* refcount released by caller */
-
 commit 5833ccff1227fbc8f1bab64351f6747a6c71bdeb
 Author: Geliang Tang <geliangtang@163.com>
 Date:   Mon Nov 16 21:46:33 2015 +0800

diff --git a/kernel.spec b/kernel.spec
index db7b3e52f656070ed79407ecc114ddac45c5eec2..4a4bc9d7dcc388fb5d310abb9039ea3b4bd602a9 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define                rel             1
 %define                basever         4.7
-%define                postver         .3
+%define                postver         .4
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -119,7 +119,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 5276563eb1f39a048e4a8a887408c031
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  803bdedd9b9cd4ef43d9d5d41801f234
+# Patch0-md5:  150cff5d90bd90217848974269a770ee
 %endif
 Source1:       kernel.sysconfig