From: Greg Kroah-Hartman Date: Thu, 5 Dec 2019 15:18:41 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v5.4.3~93 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d88743db930541b9c326288118ee2580b62ace74;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: rsi-release-skb-if-rsi_prepare_beacon-fails.patch --- diff --git a/queue-4.14/rsi-release-skb-if-rsi_prepare_beacon-fails.patch b/queue-4.14/rsi-release-skb-if-rsi_prepare_beacon-fails.patch new file mode 100644 index 00000000000..2adb5cf4443 --- /dev/null +++ b/queue-4.14/rsi-release-skb-if-rsi_prepare_beacon-fails.patch @@ -0,0 +1,30 @@ +From d563131ef23cbc756026f839a82598c8445bc45f Mon Sep 17 00:00:00 2001 +From: Navid Emamdoost +Date: Fri, 13 Sep 2019 19:08:11 -0500 +Subject: rsi: release skb if rsi_prepare_beacon fails + +From: Navid Emamdoost + +commit d563131ef23cbc756026f839a82598c8445bc45f upstream. + +In rsi_send_beacon, if rsi_prepare_beacon fails the allocated skb should +be released. + +Signed-off-by: Navid Emamdoost +Signed-off-by: Kalle Valo +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1576,6 +1576,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); diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..94cd1412733 --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1 @@ +rsi-release-skb-if-rsi_prepare_beacon-fails.patch