From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752118AbdEBGFm (ORCPT ); Tue, 2 May 2017 02:05:42 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:36028 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751024AbdEBGFV (ORCPT ); Tue, 2 May 2017 02:05:21 -0400 From: Ivan Safonov To: Greg Kroah-Hartman Cc: Aishwarya Pant , Yamanappagouda Patil , Luca Ceresoli , Jarod Wilson , "David S . Miller" , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Ivan Safonov Subject: [PATCH 3/7] staging:r8188eu: inline unprotect_frame() in mon_recv_decrypted_recv() Date: Tue, 2 May 2017 09:01:41 +0300 Message-Id: <20170502060145.26766-3-insafonov@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170502060145.26766-1-insafonov@gmail.com> References: <20170502060145.26766-1-insafonov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is useful to remove IV/ICV from rtl88eu_mon_recv_hook(). Also unprotect_frame() will be very short without skb_(pull|trim). Signed-off-by: Ivan Safonov --- drivers/staging/rtl8188eu/os_dep/mon.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rtl8188eu/os_dep/mon.c b/drivers/staging/rtl8188eu/os_dep/mon.c index 7eac87d..53f853f 100644 --- a/drivers/staging/rtl8188eu/os_dep/mon.c +++ b/drivers/staging/rtl8188eu/os_dep/mon.c @@ -70,6 +70,8 @@ static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data, int data_len, int iv_len, int icv_len) { struct sk_buff *skb; + struct ieee80211_hdr *hdr; + int hdr_len; skb = netdev_alloc_skb(dev, data_len); if (!skb) @@ -80,7 +82,19 @@ static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data, * Frame data is not encrypted. Strip off protection so * userspace doesn't think that it is. */ - unprotect_frame(skb, iv_len, icv_len); + + hdr = (struct ieee80211_hdr *)skb->data; + hdr_len = ieee80211_hdrlen(hdr->frame_control); + + if (skb->len < hdr_len + iv_len + icv_len) { + if (ieee80211_has_protected(hdr->frame_control)) { + hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_PROTECTED); + + memmove(skb->data + iv_len, skb->data, hdr_len); + skb_pull(skb, iv_len); + skb_trim(skb, skb->len - icv_len); + } + } skb->ip_summed = CHECKSUM_UNNECESSARY; skb->protocol = eth_type_trans(skb, dev); -- 2.10.2