From patchwork Mon Oct 24 11:29:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp433712wru; Mon, 24 Oct 2022 05:50:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4EHpEig7NiAaY4yClCW0d0e8mnRKVyd/zC4Qh+d6puZi+nruJGxklxE0R/iAp6VXqQWfuF X-Received: by 2002:a05:6402:501b:b0:459:df91:983 with SMTP id p27-20020a056402501b00b00459df910983mr29242275eda.85.1666615818330; Mon, 24 Oct 2022 05:50:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615818; cv=none; d=google.com; s=arc-20160816; b=lLDavvUUntj59p4JTzSqpzHnQc7v7qQZ84FrV7u1Bh66dA7RTTkyxkbRLx8yeh5c/g 1PvVr5Innk/AksM/K8OuTt3ngZWSXgzcmzU5mlGs4eZu/bBjR0U+fzqLxKLu0IBJ6O9S Md1WNsrAICh7C5wZ+tMo9gEWzg+iaeThbuPKi0o7CGipH1ZqkUScjHv4ba1RCaDOP+6E RE3Y+2lyboXhOJerLKly+fFBy74ggqeKGZiOkFCyOAL5QQrHIHNkLt7V0HJFUE1iWHIm 1g6nrIU7NOLqzu0aY95IzvDV+qzSGzzpsryjdIoe/B/nndwlo1oaJfSSF/wWy6PmESxt gpDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Zbbun71Pyk0d+oTzUB3NJlC9O072ak/GoGNeVfVObkk=; b=alJICmMkwkHwpTI2kCqkj8dWfwwjjVdAUs7KudRm0sYp+aJhUJB7NlIiYMsmJDPi2O Td4BlIGiraEr7gPBnS40nk9h3FJVslNP8zNYbrCpLGg5sIPpbxzd6uRHJifq1q9mmb3S JIodV1ZdlKq9i/A85Os/azp7Bn/1G2JHpnwSkwwkS74sy55vM8QWx/hqmyxu7X/UsIpY A1x7xRrPRYpKXEaGmFfVHT90Y1pSbc0olGBX3Dg4BOa9c/9BwFjxNa4wmuts0t277P0D 7DTNm4/yG3acqJwnTq7M/3zcCeZ9sijzCg0HXFzQ7HnVVzNB6+It7GDwv0gP6DNSVkZl azLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=V7Qd57Yj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x23-20020a170906135700b007470b52f94esi22985998ejb.199.2022.10.24.05.49.53; Mon, 24 Oct 2022 05:50:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=V7Qd57Yj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234401AbiJXMsb (ORCPT + 99 others); Mon, 24 Oct 2022 08:48:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234292AbiJXMoJ (ORCPT ); Mon, 24 Oct 2022 08:44:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC1627F08A; Mon, 24 Oct 2022 05:09:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EF4A161218; Mon, 24 Oct 2022 12:07:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BBF4C433D7; Mon, 24 Oct 2022 12:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613253; bh=uIdIsyZkWCtELS/sAPgIrAEP1Cyh+NKa0k0yNsrSR3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V7Qd57YjhQ3v1K0CK+SaX8TYibZ2vZ1LMzJvEpa/Wl47mkap8s3Fnj87j+tUUs24+ plBSGaguouIT87B3bSsHnfPlwuxAmR42sliHmNleUF09McbF/4OQRbOe55i7cTR5WN M4KD4BDnIA5W5bYqlDuCwPWcFN64mimTgIlWt4Vg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Jes Sorensen , Kalle Valo , Sasha Levin Subject: [PATCH 5.4 067/255] wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse() Date: Mon, 24 Oct 2022 13:29:37 +0200 Message-Id: <20221024113004.757211325@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747573348661799891?= X-GMAIL-MSGID: =?utf-8?q?1747573348661799891?= From: Dan Carpenter [ Upstream commit 620d5eaeb9059636864bda83ca1c68c20ede34a5 ] There some bounds checking to ensure that "map_addr" is not out of bounds before the start of the loop. But the checking needs to be done as we iterate through the loop because "map_addr" gets larger as we iterate. Fixes: 26f1fad29ad9 ("New driver: rtl8xxxu (mac80211)") Signed-off-by: Dan Carpenter Acked-by: Jes Sorensen Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/Yv8eGLdBslLAk3Ct@kili Signed-off-by: Sasha Levin --- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 048984ca81fd..3062103e216a 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -1875,13 +1875,6 @@ static int rtl8xxxu_read_efuse(struct rtl8xxxu_priv *priv) /* We have 8 bits to indicate validity */ map_addr = offset * 8; - if (map_addr >= EFUSE_MAP_LEN) { - dev_warn(dev, "%s: Illegal map_addr (%04x), " - "efuse corrupt!\n", - __func__, map_addr); - ret = -EINVAL; - goto exit; - } for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) { /* Check word enable condition in the section */ if (word_mask & BIT(i)) { @@ -1892,6 +1885,13 @@ static int rtl8xxxu_read_efuse(struct rtl8xxxu_priv *priv) ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8); if (ret) goto exit; + if (map_addr >= EFUSE_MAP_LEN - 1) { + dev_warn(dev, "%s: Illegal map_addr (%04x), " + "efuse corrupt!\n", + __func__, map_addr); + ret = -EINVAL; + goto exit; + } priv->efuse_wifi.raw[map_addr++] = val8; ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8);