Linux wireless drivers development
 help / color / mirror / Atom feed
From: wangxuerui@qiniu.com
To: linux-wireless@vger.kernel.org
Cc: Wang Xuerui <wangxuerui@qiniu.com>
Subject: [PATCH] iwlwifi: mvm: fix an unaligned access
Date: Mon, 18 Feb 2019 23:09:52 +0800	[thread overview]
Message-ID: <20190218150952.6889-1-wangxuerui@qiniu.com> (raw)

From: Wang Xuerui <wangxuerui@qiniu.com>

Tested with a Wireless AC 7265 on a MIPS box, confirmed to fix the
unaligned accesses.

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

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 6653a238f32e..a155e816262e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -57,6 +57,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"
@@ -355,8 +356,8 @@ 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 *)
-		(pkt->data + sizeof(*rx_res) + len));
+	rx_pkt_status = le32_to_cpu(get_unaligned((__le32 *)
+		(pkt->data + sizeof(*rx_res) + len)));
 
 	/* Dont use dev_alloc_skb(), we'll have enough headroom once
 	 * ieee80211_hdr pulled.
-- 
2.16.1




             reply	other threads:[~2019-02-18 15:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-18 15:09 wangxuerui [this message]
2019-02-18 19:08 ` [PATCH] iwlwifi: mvm: fix an unaligned access Jonas Gorski
2019-02-23  8:35 ` [PATCH v2] iwlwifi: mvm: fix unaligned read of rx_pkt_status Wang Xuerui
2019-02-23  8:35   ` [PATCH] " Wang Xuerui
2019-08-23  5:23     ` Luca Coelho

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=20190218150952.6889-1-wangxuerui@qiniu.com \
    --to=wangxuerui@qiniu.com \
    --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