- up to 4.9.95

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 3df7f3507005ca4406182ebbe1a722727f40ac7f..319191ce2821f2eacb3c4fdd4b50d92f33d2f795 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,55 +26,38 @@
                                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>
+From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
+Date: Mon, 6 Feb 2017 14:45:15 +0100
+Subject: [PATCH] mac80211: Print text for disassociation reason
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When disassociation happens only numeric reason is printed
+in ieee80211_rx_mgmt_disassoc(). Add text variant, too.
+
+Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
 ---
- 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 */
+ net/mac80211/mlme.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
+index 098ce9b179ee..fcf8d0aa66ec 100644
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
+ 
+       reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
+ 
+-      sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
+-                 mgmt->sa, reason_code);
++      sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n",
++                 mgmt->sa, reason_code,
++                 ieee80211_get_reason_code_string(reason_code));
+ 
+       ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
+ 
 -- 
-cgit v0.12
+2.11.0