From: Greg Kroah-Hartman Date: Fri, 13 Nov 2020 13:38:52 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.244~71 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f31b8c5138b4b795931df83c9f68724f43e141b6;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: ath9k_htc-use-appropriate-rs_datalen-type.patch --- diff --git a/queue-4.9/ath9k_htc-use-appropriate-rs_datalen-type.patch b/queue-4.9/ath9k_htc-use-appropriate-rs_datalen-type.patch new file mode 100644 index 00000000000..b68a452e2db --- /dev/null +++ b/queue-4.9/ath9k_htc-use-appropriate-rs_datalen-type.patch @@ -0,0 +1,40 @@ +From 5024f21c159f8c1668f581fff37140741c0b1ba9 Mon Sep 17 00:00:00 2001 +From: Masashi Honma +Date: Sun, 9 Aug 2020 08:32:58 +0900 +Subject: ath9k_htc: Use appropriate rs_datalen type + +From: Masashi Honma + +commit 5024f21c159f8c1668f581fff37140741c0b1ba9 upstream. + +kernel test robot says: +drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:987:20: sparse: warning: incorrect type in assignment (different base types) +drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:987:20: sparse: expected restricted __be16 [usertype] rs_datalen +drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:987:20: sparse: got unsigned short [usertype] +drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:988:13: sparse: warning: restricted __be16 degrades to integer +drivers/net/wireless/ath/ath9k/htc_drv_txrx.c:1001:13: sparse: warning: restricted __be16 degrades to integer + +Indeed rs_datalen has host byte order, so modify it's own type. + +Reported-by: kernel test robot +Fixes: cd486e627e67 ("ath9k_htc: Discard undersized packets") +Signed-off-by: Masashi Honma +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200808233258.4596-1-masashi.honma@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +@@ -972,7 +972,7 @@ static bool ath9k_rx_prepare(struct ath9 + struct ath_htc_rx_status *rxstatus; + struct ath_rx_status rx_stats; + bool decrypt_error = false; +- __be16 rs_datalen; ++ u16 rs_datalen; + bool is_phyerr; + + if (skb->len < HTC_RX_FRAME_HEADER_SIZE) { diff --git a/queue-4.9/series b/queue-4.9/series index cee1e0bd889..7e266d99647 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -22,3 +22,4 @@ i40e-wrong-truncation-from-u16-to-u8.patch i40e-fix-of-memory-leak-and-integer-truncation-in-i4.patch i40e-memory-leak-in-i40e_config_iwarp_qvlist.patch geneve-add-transport-ports-in-route-lookup-for-genev.patch +ath9k_htc-use-appropriate-rs_datalen-type.patch