Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp822533ybz; Fri, 24 Apr 2020 09:50:48 -0700 (PDT) X-Google-Smtp-Source: APiQypLU0I1b76In3wMUOrivue2wBtbYFWz63XUMgZ3XBFPt5HPEkb2mUyQi4fJXylKc9OiR5jjy X-Received: by 2002:a17:907:41b6:: with SMTP id na6mr7811066ejb.119.1587747048372; Fri, 24 Apr 2020 09:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587747048; cv=none; d=google.com; s=arc-20160816; b=CmFJnX8WhuXf+i6G3U+sa8z+w2NlHe/qesOwfnL3BikeCpMwZgWdtlRpxJ6y1pAGkc WNsdix7AxfvmZE/TKJslEE+aleZBzSyGRV4DRfPKw7cXV8S4x6T4Vfpx0w2/Nk0mKW29 hix/CVC8NUVvwW6xjoUGAM5uofFpGCMim6TROWkIxqJW5aYX8Mv9xtesdkHW9d9JR81N xQYHBYjYEDi8dhnDJddwu7Ax3gOoDjnlpgjLtb4Ip1/DIvQW6poVNZPZd/6nfv097ZLB uP3gF2jMwvbcSf+D6bz4dHxxoMMMMTyXG4KREAInu0bloh+R1ZvMuTNNhV+Rj19s79ce NP/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:cc:to:from; bh=pbORtAVpH1oknQHFMeAL4LqJTgSwNsWnKvSzvs0Qn2I=; b=dqkKgmpLQZJuTKcVwaTOi/5SXlctaCsiCPT/zucK9FkoiijkwdkCKDitnaufOIiD9E +QexgCcBYX86ycxYmah9JlO0A/7/6OMbQIjRM2pAuhtPj15mCVEBulubtTMRuNLdw/uX vSR7qkZiDoJcACpdJaD95Ep1Ln6bIeoQ7VYRa2+rtU56D5MzpFgfHdVwFeTiUwU+8W8m iYtKd8avBwTlh2iCrVNJuSIq2mrUEj8o0bnmtoV7htYvdMlN3oobeK5iCMni/vKjaYho rz/Cp+uSnLBABfeSgf1aP2hk4/ZtFgwAK6m4JFbSvy4XTDQf6fW7ZdlPmdWtltuGx6WJ sqXg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e8si3276668ejt.23.2020.04.24.09.50.25; Fri, 24 Apr 2020 09:50:48 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728649AbgDXQr1 (ORCPT + 99 others); Fri, 24 Apr 2020 12:47:27 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:57992 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728609AbgDXQrY (ORCPT ); Fri, 24 Apr 2020 12:47:24 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jS1U1-000OcH-Oq; Fri, 24 Apr 2020 19:47:22 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Fri, 24 Apr 2020 19:46:59 +0300 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200424164707.2715869-1-luca@coelho.fi> References: <20200424164707.2715869-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.4 Subject: [PATCH 03/11] iwlwifi: yoyo: remove magic number Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Mordechay Goodstein The for loop is iterating over active regions so iterate only over the len of the active regions buffer size. Signed-off-by: Mordechay Goodstein Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index 4df10f3d99d2..04de7688884d 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2119,7 +2119,11 @@ static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt, u32 size = 0; u64 regions_mask = le64_to_cpu(trigger->regions_mask); - for (i = 0; i < 64; i++) { + BUILD_BUG_ON(sizeof(trigger->regions_mask) != sizeof(regions_mask)); + BUILD_BUG_ON((sizeof(trigger->regions_mask) * BITS_PER_BYTE) < + ARRAY_SIZE(fwrt->trans->dbg.active_regions)); + + for (i = 0; i < ARRAY_SIZE(fwrt->trans->dbg.active_regions); i++) { u32 reg_type; struct iwl_fw_ini_region_tlv *reg; -- 2.26.2