From patchwork Fri Sep 8 10:41:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 13377340 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E64EEE57EF for ; Fri, 8 Sep 2023 10:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242931AbjIHKnT (ORCPT ); Fri, 8 Sep 2023 06:43:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234527AbjIHKnT (ORCPT ); Fri, 8 Sep 2023 06:43:19 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 234A71BEA for ; Fri, 8 Sep 2023 03:43:15 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1c0bae4da38so13568905ad.0 for ; Fri, 08 Sep 2023 03:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694169794; x=1694774594; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PQQCzIcQzKZ8gCy9/YOy22vWaOQGGG4cGUxmxyznMXg=; b=JbjvLvSp2NaMyRfITtj2eVN2gl4MFeF5cXMu6v0Uh3ibn8EpvfvrfxjUSsw6rt2xdh bCEKi0Zlz64VuLjKrE8Y29JaOtpuwl+PxAQcSM9Y7oi4LrUdvsYQcSajB4/fdHoa0MuX zYmIKe52+3XhIqmWkSAqmfkS9kjK3aCqKdZoI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694169794; x=1694774594; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PQQCzIcQzKZ8gCy9/YOy22vWaOQGGG4cGUxmxyznMXg=; b=TeYGVbCIAslLcn04H+zcFm7vCaYaYU+8xsSaW9x/RW7uhc4vtqDyrP4pb1s4GvcHpT DtSa33P1H79UCmqVgR36OlF/z3CKiCwC1J7iu92/wq39x6eRm+XYjFCTjR4OPfuN9NqV jjD/QyMjE1xS8KfgNbMoB+D94ZByGczhVL9T4NUGwJoQLqSSDiQ7WDISzWZrHBGQn+9M s9JwsZYATbtMBg7hbNvAb/uHQnJrey0TcNsFyG+j/qWJdNcXLsmtuU7kFV0KZalYBZIF 23AwkgRgAr++qQWzQwTyEodMB80iUgfuvzdybFR8YUzfVf7WEhHlU0+RaQ7or1K67Bqu 23gA== X-Gm-Message-State: AOJu0YwO1z+3JPK9XAvBv/ULA/H4VDnj/Tg/N2ovNzudx65B1yQHjg4L RS3L/xdNCoHzj34fKnz3Cccsn4j+rqnVwvpWN40= X-Google-Smtp-Source: AGHT+IF17AK2gxbzIfElg2MZPbCBDsW6PFsJLXynEYAQ05RCuZ4czR6tNqV7ulot8/XI2h6pYXJuPQ== X-Received: by 2002:a17:902:c942:b0:1c1:d5d1:a364 with SMTP id i2-20020a170902c94200b001c1d5d1a364mr2372755pla.33.1694169794463; Fri, 08 Sep 2023 03:43:14 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:cfe5:1210:6170:87ad]) by smtp.gmail.com with ESMTPSA id x18-20020a170902ec9200b001bbd1562e75sm1287154plg.55.2023.09.08.03.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 03:43:14 -0700 (PDT) From: Pin-yen Lin To: linux-wireless@vger.kernel.org Cc: Pin-yen Lin , Brian Norris , Kalle Valo , Polaris Pi , Matthew Wang , linux-kernel@vger.kernel.org Subject: [PATCH v3] wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet Date: Fri, 8 Sep 2023 18:41:12 +0800 Message-ID: <20230908104308.1546501-1-treapking@chromium.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Only skip the code path trying to access the rfc1042 headers when the buffer is too small, so the driver can still process packets without rfc1042 headers. Fixes: 119585281617 ("wifi: mwifiex: Fix OOB and integer underflow when rx packets") Signed-off-by: Pin-yen Lin Acked-by: Brian Norris Reviewed-by: Matthew Wang --- Changes in v3: - Really apply the sizeof call fix as it was missed in the previous patch Changes in v2: - Fix sizeof call (sizeof(rx_pkt_hdr) --> sizeof(*rx_pkt_hdr)) drivers/net/wireless/marvell/mwifiex/sta_rx.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/sta_rx.c b/drivers/net/wireless/marvell/mwifiex/sta_rx.c index 65420ad67416..257737137cd7 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_rx.c +++ b/drivers/net/wireless/marvell/mwifiex/sta_rx.c @@ -86,7 +86,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); @@ -95,12 +96,13 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv, return -1; } - if ((!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)) { + 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))) { /* * Replace the 803 header and rfc1042 header (llc/snap) with an * EthernetII header, keep the src/dst and snap_type