Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp2647974pxy; Tue, 3 Aug 2021 11:22:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqBXvVy1lGmcIDls8mCWbNV6jU3RLc1tZ5+jyRIm/MQOJVV28Q8F9FPFGx6y+Z6+wCS90h X-Received: by 2002:a92:cac2:: with SMTP id m2mr918980ilq.75.1628014974277; Tue, 03 Aug 2021 11:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628014974; cv=none; d=google.com; s=arc-20160816; b=WuCFrXIIluOXqqDdLg8+q5k/XzVdnpfrKm9mIGlacCleRG6GFFX1QnZJII4btG7Y/m 7p4A8pMO0X1EiY/Qn86cFX7NM92m4MwKKbeYvPRnbfJlDD7RCaoq54aELEOuho4fikhB ZiWFWIp1+yMB8zS4JDAoQilvDIroqN2wNTrM/TmnUKV9fkyQ0dywmaxgpXPzB1bqjEiV SlMh1u1YGNu0YrjeizLUjWfBnKHuOLrqOngo4B1WJag0KyMyRqtRLk57DG6uqrzc7g4h U5Za//pZVMAJm6IbSwQBdT5s174APB3wB2xVt+wc4NdRBljKcWlDAVrMEL6O8DdEVopG LIRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=yQXpzRt+qukZtH49AvXR+lZq2BKkun/fs7KiYXTefVQ=; b=cI0im5Mf2go5qQX+KN3lVIU2Ae+MkXmVO2sYrnd1dPnyl50tG8RVqChNZMpZxqIpbQ l3IvjcHOUONMXK3VEQ5C1JGCugKdN+ZjNLDPb+dhOO/Emhdxvv/kHxAbqxlasT9vtL+T ndpgCDMKe0LWfCIt1OiwNW5CgPVRS9ncWzjanEgMlL+NEF/E+x6jSyjsBSF0kvvaw6BB wGmNrXyW0ng4uQsF3/C2O5xz5RkpYbLoPrvpwOb5MoLFzQQlAhCmxsG+NX1CnBXfd0Go uPE32unco6Oj742N+R8ZuBtU+dxDPeEss2Ia0JT4RLXyIPOzYY3c1apl/D4t6vSuaBMa Rx4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=sU9leV7H; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id az34si4754481jab.63.2021.08.03.11.22.42; Tue, 03 Aug 2021 11:22:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=sU9leV7H; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238880AbhHCSMt (ORCPT + 99 others); Tue, 3 Aug 2021 14:12:49 -0400 Received: from smtp-relay-canonical-1.canonical.com ([185.125.188.121]:41352 "EHLO smtp-relay-canonical-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238829AbhHCSMr (ORCPT ); Tue, 3 Aug 2021 14:12:47 -0400 Received: from [10.172.193.212] (1.general.cking.uk.vpn [10.172.193.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id F01C73F35B; Tue, 3 Aug 2021 18:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628014354; bh=yQXpzRt+qukZtH49AvXR+lZq2BKkun/fs7KiYXTefVQ=; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=sU9leV7Hl0yx62sOaASnlhuYnbY7ubcsZiPetMuI0Rn5Sg0XRn32mrsOhqFb30bhH YvhvOqdvUaChbu5H0zgpz2hUFrLAQ99NpyE4IJE0adRc4Q379rfGyx3oNhMTBw4sYm iS0ae76svGlqGK1PxpTsoVJw/lSSeB1fM7vS1c4nEtN/gc+1vU1CZG1xYK8Gvm4/J0 G6KKzlV719/SkELeCh2C8vUj0+yMOUBHHmf5mC+YVb+AlCuLH6Iu/j9W9UOla1qCVX aI3L/9EllxRTJUaBjgn74udfOIJww/V35uO6tEiDh17Y7LOcrA1cAhaVoNymdGGz9j 7nSZHRiw1TE/w== Subject: Re: [PATCH 3/3] rtlwifi: rtl8192de: fix array size limit in for-loop To: Joe Perches , Ping-Ke Shih , Kalle Valo , "David S . Miller" , Jakub Kicinski , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210803144949.79433-1-colin.king@canonical.com> <20210803144949.79433-3-colin.king@canonical.com> <39b42c868d1aa01bb421733aac32f072dc85e393.camel@perches.com> From: Colin Ian King Message-ID: <3ce51250-bf32-97a6-a7e1-f49b27116907@canonical.com> Date: Tue, 3 Aug 2021 19:12:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <39b42c868d1aa01bb421733aac32f072dc85e393.camel@perches.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 03/08/2021 19:11, Joe Perches wrote: > On Tue, 2021-08-03 at 15:49 +0100, Colin King wrote: >> From: Colin Ian King >> >> Currently the size of the entire array is being used in a for-loop >> for the element count. While this works since the elements are u8 >> sized, it is preferred to use ARRAY_SIZE to get the element count >> of the array. > [] >> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c > [] >> @@ -1366,7 +1366,7 @@ u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl) >>   u8 place = chnl; >> >>   if (chnl > 14) { >> - for (place = 14; place < sizeof(channel_all); place++) { >> + for (place = 14; place < ARRAY_SIZE(channel_all); place++) { >>   if (channel_all[place] == chnl) >>   return place - 13; >>   } > > Thanks. > > It seems a relatively common copy/paste use in rtlwifi Urgh. Let's drop patch 3/3 for the moment. I'll send a fix later on, I'm kinda tied up for the next 24 hours. > > $ git grep -P -n 'for\b.*<\s*sizeof\s*\(\s*\w+\w*\)\s*;' drivers/net/wireless/realtek/rtlwifi/ > drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c:893: for (place = 14; place < sizeof(channel5g); place++) { > drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c:1368: for (place = 14; place < sizeof(channel_all); place++) { > drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c:2430: for (i = 0; i < sizeof(channel5g); i++) > drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c:2781: for (place = 14; place < sizeof(channel_all); place++) { > drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c:2170: for (place = 14; place < sizeof(channel_all); place++) { > drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c:3610: for (place = 14; place < sizeof(channel_all); place++) > > >