From 02b19b4c4920cf7976828216b36f0f2317aa20be Mon Sep 17 00:00:00 2001
From: Ivan Safonov <insafonov@gmail.com>
Date: Tue, 2 May 2017 09:01:41 +0300
Subject: [PATCH] staging:r8188eu: inline unprotect_frame() in mon_recv_decrypted_recv()
Git-commit: 02b19b4c4920cf7976828216b36f0f2317aa20be
Patch-mainline: v4.13-rc1
References: FATE#326906
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 <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
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 7eac87d641cf..53f853f08428 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.19.1