Unverified Commit a32a9e4a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5096 wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongqiang Liu <liuyongqiang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SNZ6DRUPFTWYSD4RBWAWNJLX7LY5YZXH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I95AXH 
 
Link:https://gitee.com/openeuler/kernel/pulls/5096

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents fbc17ade ab1fed0c

drivers/net/wireless/marvell/mwifiex/sta_rx.c

+9 −7
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv, 
	rx_pkt_len = le16_to_cpu(local_rx_pd->rx_pkt_length);

	rx_pkt_hdr = (void *)local_rx_pd + rx_pkt_off;



	if (sizeof(*rx_pkt_hdr) + rx_pkt_off > skb->len) {

	if (sizeof(rx_pkt_hdr->eth803_hdr) + sizeof(rfc1042_header) +

	    rx_pkt_off > skb->len) {

		mwifiex_dbg(priv->adapter, ERROR,

			    "wrong rx packet offset: len=%d, rx_pkt_off=%d\n",

			    skb->len, rx_pkt_off);
@@ -107,12 +108,13 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv, 
		return -1;

	}



	if ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,

	if (sizeof(*rx_pkt_hdr) + rx_pkt_off <= skb->len &&

	    ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,

		      sizeof(bridge_tunnel_header))) ||

	     (!memcmp(&rx_pkt_hdr->rfc1042_hdr, rfc1042_header,

		      sizeof(rfc1042_header)) &&

	      ntohs(rx_pkt_hdr->rfc1042_hdr.snap_type) != ETH_P_AARP &&

	     ntohs(rx_pkt_hdr->rfc1042_hdr.snap_type) != ETH_P_IPX)) {

	      ntohs(rx_pkt_hdr->rfc1042_hdr.snap_type) != ETH_P_IPX))) {

		/*

		 *  Replace the 803 header and rfc1042 header (llc/snap) with an

		 *    EthernetII header, keep the src/dst and snap_type