pending stuff

diff --git a/pending/futex_issues.txt b/pending/futex_issues.txt
index b4ac520dd8b8393e6d1b11862c0b7ed3f073e3d8..097922a6d7c502636713cb5c7d1ce2d22b683089 100644 (file)
--- a/pending/futex_issues.txt
+++ b/pending/futex_issues.txt
@@ -1,2 +1,2 @@
-need to go to 4.19 and older:
+need to go to 4.14 and older:
        ca16d5bee59807bf04deaab0a8eccecd5061528c..3ef240eaff36b8119ac9e2ea17cbf41179c930ba inclusive

diff --git a/pending/rsi-release-skb-if-rsi_prepare_beacon-fails.patch b/pending/rsi-release-skb-if-rsi_prepare_beacon-fails.patch
new file mode 100644 (file)
index 0000000..bdde323
--- /dev/null
+++ b/pending/rsi-release-skb-if-rsi_prepare_beacon-fails.patch
@@ -0,0 +1,28 @@
+From d563131ef23cbc756026f839a82598c8445bc45f Mon Sep 17 00:00:00 2001
+From: Navid Emamdoost <navid.emamdoost@gmail.com>
+Date: Fri, 13 Sep 2019 19:08:11 -0500
+Subject: rsi: release skb if rsi_prepare_beacon fails
+
+From: Navid Emamdoost <navid.emamdoost@gmail.com>
+
+commit d563131ef23cbc756026f839a82598c8445bc45f upstream.
+
+In rsi_send_beacon, if rsi_prepare_beacon fails the allocated skb should
+be released.
+
+Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
+index 6c7f26ef6476..9cc8a335d519 100644
+--- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c
++++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
+@@ -1756,6 +1756,7 @@ static int rsi_send_beacon(struct rsi_common *common)
+               skb_pull(skb, (64 - dword_align_bytes));
+       if (rsi_prepare_beacon(common, skb)) {
+               rsi_dbg(ERR_ZONE, "Failed to prepare beacon\n");
++              dev_kfree_skb(skb);
+               return -EINVAL;
+       }
+       skb_queue_tail(&common->tx_queue[MGMT_BEACON_Q], skb);