From patchwork Mon Oct 24 11:28:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp465082wru; Mon, 24 Oct 2022 06:51:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5sQeqlOPP0qwLgsz6YH4W3XLyNGa3zhh5URWiwenSier8UfCwBBNtQ7EEUp4ZROH8EFkKs X-Received: by 2002:a17:90a:588a:b0:212:fa50:7dec with SMTP id j10-20020a17090a588a00b00212fa507decmr9608775pji.190.1666619514187; Mon, 24 Oct 2022 06:51:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619514; cv=none; d=google.com; s=arc-20160816; b=v6oPLWS3NftBPfIzI9HgyQEoDi44egLZa+zoOuPGDN+dk30j+L5h2Iowwxktxo0OU3 u2VB0CHUQbEUb5BMSIAXtYDOY3zYN3mINusBs+/sL3q+yy2+wqQ2keRWiTwGUtPwfx4v pL07f+8+bijTbaL2896Wbn6l17Ny160GBaVpa9utMeRuMeluIqaU8Rq0bGWOCHj8zoMt B+F12E5tfukcoaAZz70JpX3FbKQeb6+74XyIfiIE/xA6YLraMuakZI93D+inxObaNB3Z Q8xPdhPdRfh1/8Nf7bJjxc5kXxWK1bG9x4df9mf1SrJI/Y+U9PJcH4zgnRwsoX/PSrN+ AkQQ== 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=X0YH0nBD4HlnVQhE2Mzz5eTWHzmqcPdBIzxVJDbY9EI=; b=kg8grB67nBnU6ANqpWXUehPG8CNglJh5Pi634KJrDpM9HJ9EdUSpjIYWw96P+999tE 6bY4q4bPKkHfrnFd6MhbHdkjPneUD51NAfahKkaJ1/dBYXHHhcYJUFCY4ay4IzKckHJS 92s8Cu1XNcZKaJuqM1ENMSkXSuNuWlgdyZVHmLaCNLUkQPjXIa3mUskeP7hlMW6tdL63 tApQF2LY8lehM7nvNUC8oc2j8GxcjRYgLS912xmj/kaEC7G9fTSMo340esYXBowxGVw3 1xDVjSWLj1yn3H2e8me056lToWFHnQsqnl0uEbVP7Cdy2I0T9UHoayRb6al6wyaR1TRc 9bHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oBOq0C6x; 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 jf2-20020a170903268200b001869ef16477si4817321plb.356.2022.10.24.06.51.41; Mon, 24 Oct 2022 06:51:54 -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=oBOq0C6x; 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 S236594AbiJXNvF (ORCPT + 99 others); Mon, 24 Oct 2022 09:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236747AbiJXNty (ORCPT ); Mon, 24 Oct 2022 09:49:54 -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 4FF08B97AC; Mon, 24 Oct 2022 05:41:48 -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 E9FFA61338; Mon, 24 Oct 2022 12:41:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07918C433D6; Mon, 24 Oct 2022 12:41:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615282; bh=BYixp+EKXwTz/6bdl0MMv7Wbv9UmnCi5DfCsLpA1HW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oBOq0C6xtlB15f206ss0N/jOl3jgn9553KvamwcEaqI14ee3xpwCS9ZjRQr9cOIE7 RkABtvSs/KIZaGSgFDCBWUabcZuDpHjixiMB3SbPpOiAR3qBXcEcoxF1Ir4ZBWmFv1 HmxQoAOE8oCYd2oOxWfWo3fgk95V69jzdByXLdks= 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.15 164/530] wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse() Date: Mon, 24 Oct 2022 13:28:28 +0200 Message-Id: <20221024113052.487209057@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747577223628773180?= X-GMAIL-MSGID: =?utf-8?q?1747577223628773180?= 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 774341b0005a..30a2e938d19a 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -1874,13 +1874,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)) { @@ -1891,6 +1884,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);