From patchwork Sat Jul 10 18:37:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davis X-Patchwork-Id: 472829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5C42C07E95 for ; Sat, 10 Jul 2021 18:37:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 94B7D61249 for ; Sat, 10 Jul 2021 18:37:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229674AbhGJSkY (ORCPT ); Sat, 10 Jul 2021 14:40:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbhGJSkY (ORCPT ); Sat, 10 Jul 2021 14:40:24 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DAF8C0613DD for ; Sat, 10 Jul 2021 11:37:38 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id t17so31180384lfq.0 for ; Sat, 10 Jul 2021 11:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mosenkovs.lv; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EbjLAPuy/4CQacoiTnOvqyxNeqOeWAbO6F6kFUZ/Sck=; b=kPTkJ30AQH8zNSCnBdAPAYsuUn15xM5pi413Bj4jeYd6kvPnPiCaeofJeE+rmTHOww iS2x4rNUolut0Zlz1vEVhLz6AcmLJs91OPOguQQGK/UMeiwzHndKqWwf+jbS2x/4yTtv ZKbyG3wVcny31W3NT9/RC/gr/K52+isuVCWVk= 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:mime-version :content-transfer-encoding; bh=EbjLAPuy/4CQacoiTnOvqyxNeqOeWAbO6F6kFUZ/Sck=; b=bNStmlYbYdChJq3WDjSH01L/gNySSEWV+n2GqKjc8AI89NfibTb2KiMvm2cxvAcfft wnS3mMMRvsTe0oe2b47ttyz4/j4yaBgbaRiNVd4grV6Jpob+AMa4wLqtpxSVF9yYAHUl uJRAPGkppL50VSS2U0YX+YIzzCwSMU9d6f6s+fnaCJ0h0qChAvLGBecweBXz/7yfA57x l9DHbJagvw+f2pqyp8UI5HWnpQ2r1MQOlsWBRcS9qudvjqTxhHJnlodes5wURVlcdICr H2eY26XQc3E1+jNYeh9d8jXuHCVJhQARLwh3upJ0sPNzjW3ARDSPRF7TMVVC7begvdf3 Rqfg== X-Gm-Message-State: AOAM5307pcXIabldxQ/XJWXGyOXHze+7wgG9fXgl3MFZYxwjOBxrHm3A amrn/KSVBiRNKe6qEUD8zYiG2A== X-Google-Smtp-Source: ABdhPJzWxZ+9SS3gKVip+Gfv+uNlEpo6CKHb2TP/kzqedU2xAAU3lWTKtt2igse0aSsSfvGyHLZ/yQ== X-Received: by 2002:ac2:4118:: with SMTP id b24mr32893258lfi.643.1625942256754; Sat, 10 Jul 2021 11:37:36 -0700 (PDT) Received: from ubuntu.ciemini.majas.lan (balticom-135-235.balticom.lv. [83.99.135.235]) by smtp.gmail.com with ESMTPSA id 139sm973980ljf.125.2021.07.10.11.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 11:37:36 -0700 (PDT) From: Davis Mosenkovs To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, stable@vger.kernel.org, Davis Mosenkovs Subject: [PATCH 4.4] mac80211: fix memory corruption in EAPOL handling Date: Sat, 10 Jul 2021 21:37:10 +0300 Message-Id: <20210710183710.5687-1-davis@mosenkovs.lv> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit e3d4030498c3 ("mac80211: do not accept/forward invalid EAPOL frames") uses skb_mac_header() before eth_type_trans() is called leading to incorrect pointer, the pointer gets written to. This issue has appeared during backporting to 4.4, 4.9 and 4.14. Fixes: e3d4030498c3 ("mac80211: do not accept/forward invalid EAPOL frames") Link: https://lore.kernel.org/r/CAHQn7pKcyC_jYmGyTcPCdk9xxATwW5QPNph=bsZV8d-HPwNsyA@mail.gmail.com Cc: # 4.4.x Signed-off-by: Davis Mosenkovs --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index bde924968cd2..b5848bcc09eb 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2234,7 +2234,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) #endif if (skb) { - struct ethhdr *ehdr = (void *)skb_mac_header(skb); + struct ethhdr *ehdr = (struct ethhdr *)skb->data; /* deliver to local stack */ skb->protocol = eth_type_trans(skb, dev);