4.14-stable patches

added patches:
	ath9k_htc-use-appropriate-rs_datalen-type.patch

diff --git a/queue-4.14/ath9k_htc-use-appropriate-rs_datalen-type.patch b/queue-4.14/ath9k_htc-use-appropriate-rs_datalen-type.patch
new file mode 100644 (file)
index 0000000..0f3dc4f
--- /dev/null
+++ b/queue-4.14/ath9k_htc-use-appropriate-rs_datalen-type.patch
@@ -0,0 +1,40 @@
+From 5024f21c159f8c1668f581fff37140741c0b1ba9 Mon Sep 17 00:00:00 2001
+From: Masashi Honma <masashi.honma@gmail.com>
+Date: Sun, 9 Aug 2020 08:32:58 +0900
+Subject: ath9k_htc: Use appropriate rs_datalen type
+
+From: Masashi Honma <masashi.honma@gmail.com>
+
+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 <lkp@intel.com>
+Fixes: cd486e627e67 ("ath9k_htc: Discard undersized packets")
+Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Link: https://lore.kernel.org/r/20200808233258.4596-1-masashi.honma@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -973,7 +973,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.14/series b/queue-4.14/series
index dd95b961e1d25eb8302e99a4741fc99239c47ba5..fd939f79407944b9d324247b007f6c1b19c48564 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -19,3 +19,4 @@ can-peak_usb-peak_usb_get_ts_time-fix-timestamp-wrap.patch
 can-peak_canfd-pucan_handle_can_rx-fix-echo-manageme.patch
 xfs-flush-new-eof-page-on-truncate-to-avoid-post-eof.patch
 btrfs-fix-missing-error-return-if-writeback-for-exte.patch
+ath9k_htc-use-appropriate-rs_datalen-type.patch