]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.3-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 14:00:02 +0000 (15:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 14:00:02 +0000 (15:00 +0100)
added patches:
rsi-release-skb-if-rsi_prepare_beacon-fails.patch

queue-5.3/rsi-release-skb-if-rsi_prepare_beacon-fails.patch [new file with mode: 0644]
queue-5.3/series

diff --git a/queue-5.3/rsi-release-skb-if-rsi_prepare_beacon-fails.patch b/queue-5.3/rsi-release-skb-if-rsi_prepare_beacon-fails.patch
new file mode 100644 (file)
index 0000000..6b31da0
--- /dev/null
@@ -0,0 +1,30 @@
+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>
+
+---
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- 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_co
+               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);
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..94cd14127338e557a873d6e00a9febf53561145b 100644 (file)
@@ -0,0 +1 @@
+rsi-release-skb-if-rsi_prepare_beacon-fails.patch