From patchwork Mon Apr 24 11:40:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hughes X-Patchwork-Id: 9696045 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 457DD60113 for ; Mon, 24 Apr 2017 11:41:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34A7B27FBE for ; Mon, 24 Apr 2017 11:41:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27EDF2810E; Mon, 24 Apr 2017 11:41:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F86C27FBE for ; Mon, 24 Apr 2017 11:41:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1169178AbdDXLlG (ORCPT ); Mon, 24 Apr 2017 07:41:06 -0400 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]:64751 "EHLO mx07-00252a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1169137AbdDXLlD (ORCPT ); Mon, 24 Apr 2017 07:41:03 -0400 Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v3OBe6ll009014 for ; Mon, 24 Apr 2017 12:41:02 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : cc : subject : date : message-id; s=pp; bh=H/HiHXXhCsj4qXRqktxYrewj6FAyh53ZkQ09QI6f7fw=; b=v/FsJskVeO5SsXs9Mc9615E6OMEkgnfCNbnTOQZQl3hDjaLWpclkmJrKpETxfcKSQfYe B+2q7EME40Ox4nGH0Y8MpBhSwU+wMY9Y+pa2qSxN/s4mLRqUpGVAdxWsS9OWnml9D5JD lCPvCcVPRVT5IkzC9UBuU5TnGPjwrUuhpofRmopF/VXpNcmkm4GCMq4I1fn4X3OBtcMo EygQKsftfMxQXlfYvtJVtvAVMkT4hqtaaiom4CT5E3jefqqaKP81n+8zVJWJ4MUbzgxz a9hfLQYDvmUl6W4ZtQjVKSYkjlVs+7a6m8AYAdDlN91jcFLrZ4sxYlZOLw4z9Iuc7/fX eA== Received: from mail-wm0-f69.google.com (mail-wm0-f69.google.com [74.125.82.69]) by mx07-00252a01.pphosted.com with ESMTP id 29yvjys1vq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Mon, 24 Apr 2017 12:41:01 +0100 Received: by mail-wm0-f69.google.com with SMTP id b87so4556866wmi.14 for ; Mon, 24 Apr 2017 04:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=H/HiHXXhCsj4qXRqktxYrewj6FAyh53ZkQ09QI6f7fw=; b=LuZKGAEbqxPufa4qRRF5RUbmFjsGIJwvCC7lqZrrgR/8cwk1afJoWTSaTLBQuwEBq4 4ohugytlL03OnICBCu7ugWczs5tKB6HwmrvxBSqb5GzY5WjYT+3W/FfPhn7jtvtIlYZ/ 3myEdA+HRO4BTrUNbfZJaUrEcn7d2iFHv4Vkk0NWYOAnzT3Z53c9dwR1p9hBI22NUtgM tzbiDdxVRN7DW7sYs6GZ4rV62DgpGhHKSRSHsjdn/z20hmciSvdJlIV0Yp/WmLOr7SBD LzuZubideQAnDLdVggXtOWu6GtxGKhqi66+13h/Qma9oyQxee/nOAP0f782/L2vgM8JR Q2Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=H/HiHXXhCsj4qXRqktxYrewj6FAyh53ZkQ09QI6f7fw=; b=TrNKwIB9NubMxHeL/t83tlmmMf3/xDk/TN6SdMloNmJsXEbqy5OAqAt7X6E2l/WHMB jzE/s9U4ubWdXYc9jkYbhhlZa/w/1+q6OzgZ0Z34g+SJV60ueZPDtmsdV/uPI4+bIhvU vjubkX5ooIBTtw7TlbwEFAcl/XG6Xjw8V+x96dBUw55jCAfNp6LWVy+bPbsrY3v6Tn50 dca5s+Y17oZHi+lNNsKjx37ZeI5Z9qKM2EU/3wNR5fL78NKIcz7kwpnRP0Kg9yurWQLy FGkFEo+d3LRnGXCcWKM17ofn27fNfa13Lr8tpUKAmLULzH3fvEQOyp9YRtqMfmeDOk6t mKRA== X-Gm-Message-State: AN3rC/40Np62L84NMWI+tgBTrGAFnKBYTRacEFV7zyYtkHsqGu2W5bBu jY22sEYLMKSdlxPVvvZs6ydCqZZ1lpaM1HRRryyr9JqE7PybNWb4Cb/mA8eEp1bZsExhde3e54J rn0BBCewSYWm2r1H2rg== X-Received: by 10.223.132.39 with SMTP id 36mr5293111wrf.182.1493034061124; Mon, 24 Apr 2017 04:41:01 -0700 (PDT) X-Received: by 10.223.132.39 with SMTP id 36mr5293072wrf.182.1493034060513; Mon, 24 Apr 2017 04:41:00 -0700 (PDT) Received: from jamesh-VirtualBox ([217.33.127.173]) by smtp.gmail.com with ESMTPSA id r60sm13050397wrb.37.2017.04.24.04.40.58 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Apr 2017 04:40:59 -0700 (PDT) From: James Hughes To: Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, netdev@vger.kernel.org Cc: James Hughes Subject: [PATCH v2] brcmfmac: Ensure pointer correctly set if skb data location changes Date: Mon, 24 Apr 2017 12:40:50 +0100 Message-Id: <20170424114050.24948-1-james.hughes@raspberrypi.org> X-Mailer: git-send-email 2.11.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-04-24_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1704240207 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The incoming skb header may be resized if header space is insufficient, which might change the data adddress in the skb. Ensure that a cached pointer to that data is correctly set by moving assignment to after any possible changes. Signed-off-by: James Hughes Acked-by: Arend van Spriel --- Changes in v2 Moved the assignment below the len check - saves a few cycles if the length check fails. drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 5eaac13e2317..9b7c19a508ac 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -198,7 +198,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, int ret; struct brcmf_if *ifp = netdev_priv(ndev); struct brcmf_pub *drvr = ifp->drvr; - struct ethhdr *eh = (struct ethhdr *)(skb->data); + struct ethhdr *eh; brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx); @@ -236,6 +236,8 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, goto done; } + eh = (struct ethhdr *)(skb->data); + if (eh->h_proto == htons(ETH_P_PAE)) atomic_inc(&ifp->pend_8021x_cnt);