From patchwork Mon Jul 19 14:48:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 479926 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4238990jao; Mon, 19 Jul 2021 08:36:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweeJXQZvKFHx1pHTZH8FE6KNOLV1o1LdcmoisMf9wrOe8m/mSymIf3VaPqjcbHTfUHLO9a X-Received: by 2002:a05:6402:1d49:: with SMTP id dz9mr35033219edb.301.1626708890120; Mon, 19 Jul 2021 08:34:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708890; cv=none; d=google.com; s=arc-20160816; b=Qvzfc2ltIl+UQVaf82lh025zKQGH3MU2C8GJYXa6oGv8V0hhQVdTTBYEokRZaVJMSG 1Zg95RT2A3fX3Z0pbzAk2oh+Bw8i/hgejw9uU6c+QPjxMa+tw3BCNPiweZ0JvzsTqXeV yRK28n9n4yZfY3E371pbJkNXWk4RhH0iBKexyM1RND+N1dCcmh4RJ0c4PmlJfiBIdQ7f 7np+YaaqFpAjNlKeAvHgkRhW8IkrEMneTRvZ19bqNzh2Q+uTskOoHZ7TJD2htTlnoOw1 8e1AdPJbObDMWtjht6Ke+utg0AkqlHYuy4ijFnfbq6HXc793cXuguTi+HCm1NiOV+gSU ySdg== 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=sImHKwBcxZbCR7pH6LTJ8Gyo2zps5tOkEy4yIQSmmso=; b=kHfKoZVRcG240fxXpL7WA/Q//E2HDqtsMZKLRu4QyugyLJ2Wm1eF1yr0aC2eVc8Mig GoENfzB6941of/VkTKQ/3iLEhEcJ+qmVLpmdG0asBjciq9vN6ar3PSeT4dfuk+gZI1wA A3pzCaxrTZEJMgO0FhDW31SKXpDtAl67uIfYZrX6EPVGtg9jHKXeEYDqfLilcsWFw0cr t9bgZ63UG7cKJ5s9ZB6UWpA/IxZbVSj2bvfmV+i8rVV/S7QuRgcIpSeDjnUNHdvV96l/ TSv/n9o3Clc+2Fk6ui439OVk5hKDHeCBM2yzH7TQVjxRINgF4flx7btD3oq6J9Kr7Fce Rjpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vmjcture; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d26si22214751ejz.183.2021.07.19.08.34.49; Mon, 19 Jul 2021 08:34:50 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=vmjcture; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S241176AbhGSOyH (ORCPT + 12 others); Mon, 19 Jul 2021 10:54:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:45360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238487AbhGSOu5 (ORCPT ); Mon, 19 Jul 2021 10:50:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A58B06113E; Mon, 19 Jul 2021 15:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708697; bh=otmDFl3bb8bNxmMS+Kizgb9w3UPlanoTbq23BV0ha6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vmjcturewXG76rKVNyhMQ/hE+DWkOUk4TGEvryJ++o7MSrukH3ifemUW5pWu8zOJd 9V8YHbItejcALpUZ4M+ZNCMjkAexG0h4j4zj7OowTyqDye6FBVIEFvLep7lCEqw1uL xl5CqnOg329MoVQpuW9uGzEwRZLsNPjHWW2oXNbI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Masahiro Yamada , Randy Dunlap , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 4.19 093/421] ia64: mca_drv: fix incorrect array size calculation Date: Mon, 19 Jul 2021 16:48:24 +0200 Message-Id: <20210719144949.842179612@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit c5f320ff8a79501bb59338278336ec43acb9d7e2 ] gcc points out a mistake in the mca driver that goes back to before the git history: arch/ia64/kernel/mca_drv.c: In function 'init_record_index_pools': arch/ia64/kernel/mca_drv.c:346:54: error: expression does not compute the number of elements in this array; element typ e is 'int', not 'size_t' {aka 'long unsigned int'} [-Werror=sizeof-array-div] 346 | for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++) | ^ This is the same as sizeof(size_t), which is two shorter than the actual array. Use the ARRAY_SIZE() macro to get the correct calculation instead. Link: https://lkml.kernel.org/r/20210514214123.875971-1-arnd@kernel.org Signed-off-by: Arnd Bergmann Cc: Masahiro Yamada Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/ia64/kernel/mca_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index dfe40cbdf3b3..06419a95af30 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c @@ -343,7 +343,7 @@ init_record_index_pools(void) /* - 2 - */ sect_min_size = sal_log_sect_min_sizes[0]; - for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++) + for (i = 1; i < ARRAY_SIZE(sal_log_sect_min_sizes); i++) if (sect_min_size > sal_log_sect_min_sizes[i]) sect_min_size = sal_log_sect_min_sizes[i];