From 7365706bd57de70ebfddf96b1b9587466f8b20b6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Dec 2019 14:59:07 +0100 Subject: [PATCH] pending stuff --- pending/futex_issues.txt | 2 +- ...ease-skb-if-rsi_prepare_beacon-fails.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pending/rsi-release-skb-if-rsi_prepare_beacon-fails.patch diff --git a/pending/futex_issues.txt b/pending/futex_issues.txt index b4ac520dd8b..097922a6d7c 100644 --- 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 index 00000000000..bdde3231370 --- /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 +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 + +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); -- 2.47.3