linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 02/12] iwlwifi: mvm: fix unaligned read of rx_pkt_status
Date: Sun, 20 Oct 2019 11:55:35 +0300	[thread overview]
Message-ID: <20191020085545.16407-3-luca@coelho.fi> (raw)
In-Reply-To: <20191020085545.16407-1-luca@coelho.fi>

From: Wang Xuerui <wangxuerui@qiniu.com>

This is present since the introduction of iwlmvm.
Example stack trace on MIPS:

[<ffffffffc0789328>] iwl_mvm_rx_rx_mpdu+0xa8/0xb88 [iwlmvm]
[<ffffffffc0632b40>] iwl_pcie_rx_handle+0x420/0xc48 [iwlwifi]

Tested with a Wireless AC 7265 for ~6 months, confirmed to fix the
problem. No other unaligned accesses are spotted yet.

Signed-off-by: Wang Xuerui <wangxuerui@qiniu.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 0ad8ed23a455..5ee33c8ae9d2 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -60,6 +60,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
+#include <asm/unaligned.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include "iwl-trans.h"
@@ -357,7 +358,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
 	rx_res = (struct iwl_rx_mpdu_res_start *)pkt->data;
 	hdr = (struct ieee80211_hdr *)(pkt->data + sizeof(*rx_res));
 	len = le16_to_cpu(rx_res->byte_count);
-	rx_pkt_status = le32_to_cpup((__le32 *)
+	rx_pkt_status = get_unaligned_le32((__le32 *)
 		(pkt->data + sizeof(*rx_res) + len));
 
 	/* Dont use dev_alloc_skb(), we'll have enough headroom once
-- 
2.23.0


  parent reply	other threads:[~2019-10-20  8:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-20  8:55 [PATCH 00/12] iwlwifi: updates intended for v5.5 2019-20 Luca Coelho
2019-10-20  8:55 ` [PATCH 01/12] iwlwifi: remove redundant assignment to variable bufsz Luca Coelho
2019-10-20  8:55 ` Luca Coelho [this message]
2019-10-20  8:55 ` [PATCH 03/12] iwlwifi: scan: make new scan req versioning flow Luca Coelho
2019-10-20 14:41   ` [PATCH v2 " Luca Coelho
2019-10-20  8:55 ` [PATCH 04/12] iwlwifi: scan: support scan req cmd ver 12 Luca Coelho
2019-10-20  8:55 ` [PATCH 05/12] iwlwifi: refactor the SAR tables from mvm to acpi Luca Coelho
2019-10-20  8:55 ` [PATCH 06/12] iwlwifi: mvm: scan: enable adaptive dwell in p2p Luca Coelho
2019-10-20  8:55 ` [PATCH 07/12] iwlwifi: mvm: don't skip mgmt tid when flushing all tids Luca Coelho
2019-10-25  8:04   ` Kalle Valo
2019-10-20  8:55 ` [PATCH 08/12] iwlwifi: mvm: start CTDP budget from 2400mA Luca Coelho
2019-10-20  8:55 ` [PATCH 09/12] iwlwifi: mvm: sync the iwl_mvm_session_prot_notif layout Luca Coelho
2019-10-20  8:55 ` [PATCH 10/12] iwlwifi: remove IWL_DEVICE_22560/IWL_DEVICE_FAMILY_22560 Luca Coelho
2019-10-20  8:55 ` [PATCH 11/12] iwlwifi: 22000: fix some indentation Luca Coelho
2019-10-20  8:55 ` [PATCH 12/12] iwlwifi: mvm: fix non-ACPI function Luca Coelho
2020-01-23  4:02   ` Stable Backport Request: " Jiaxun Yang
2020-01-23  5:42   ` Jiaxun Yang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191020085545.16407-3-luca@coelho.fi \
    --to=luca@coelho.fi \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).