- up to 4.8.4

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 3df7f3507005ca4406182ebbe1a722727f40ac7f..28517b8ba73a02d99c71733dc738dde08270f500 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,55 +26,4 @@
                                exit
                        fi
                done
-From 069d5ac9ae0d271903cc4607890616418118379a Mon Sep 17 00:00:00 2001
-From: "Eric W. Biederman" <ebiederm@xmission.com>
-Date: Fri, 30 Sep 2016 11:28:05 -0500
-Subject: autofs:  Fix automounts by using current_real_cred()->uid
-
-Seth Forshee reports that in 4.8-rcN some automounts are failing
-because the requesting the automount changed.
-
-The relevant call path is:
-follow_automount()
-    ->d_automount
-    autofs4_d_automount
-       autofs4_mount_wait
-           autofs4_wait
-
-In autofs4_wait wq_uid and wq_gid are set to current_uid() and
-current_gid respectively.  With follow_automount now overriding creds
-uid that we export to userspace changes and that breaks existing
-setups.
-
-To remove the regression set wq_uid and wq_gid from
-current_real_cred()->uid and current_real_cred()->gid respectively.
-This restores the current behavior as current->real_cred is identical
-to current->cred except when override creds are used.
-
-Cc: stable@vger.kernel.org
-Fixes: aeaa4a79ff6a ("fs: Call d_automount with the filesystems creds")
-Reported-by: Seth Forshee <seth.forshee@canonical.com>
-Tested-by: Seth Forshee <seth.forshee@canonical.com>
-Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
----
- fs/autofs4/waitq.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
-index 431fd7e..e44271d 100644
---- a/fs/autofs4/waitq.c
-+++ b/fs/autofs4/waitq.c
-@@ -431,8 +431,8 @@ int autofs4_wait(struct autofs_sb_info *sbi,
-               memcpy(&wq->name, &qstr, sizeof(struct qstr));
-               wq->dev = autofs4_get_dev(sbi);
-               wq->ino = autofs4_get_ino(sbi);
--              wq->uid = current_uid();
--              wq->gid = current_gid();
-+              wq->uid = current_real_cred()->uid;
-+              wq->gid = current_real_cred()->gid;
-               wq->pid = pid;
-               wq->tgid = tgid;
-               wq->status = -EINTR; /* Status return if interrupted */
--- 
-cgit v0.12
 

diff --git a/kernel.spec b/kernel.spec
index e1facd032a599fdc43f728f0fa5650726e038425..93c2b34af2083e65a3597d9bcb45d2a68802943f 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
 
 %define                rel             1
 %define                basever         4.8
-%define                postver         .3
+%define                postver         .4
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -118,7 +118,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: c1af0afbd3df35c1ccdc7a5118cd2d07
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  9e430392b1cc430522fa7b27fc4301fc
+# Patch0-md5:  4d85e2c59ec33dd7766e18d079e75114
 %endif
 Source1:       kernel.sysconfig