From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1313B8489 for ; Fri, 10 Mar 2023 14:15:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3249C4339E; Fri, 10 Mar 2023 14:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678457722; bh=ypIDq0iQ70tueb0cdm8lg82AZoQf2hLq1XJqU3C7UQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kkvMt5hNJ0ucmVe9nXcJO21UaaQeDSZHh0RdDl1hVbb6d2fRe6u75BOb7bmUMKD91 OPcvK9dPBlsplwAKF/IEeIP4Q2/+yKXDywJnq8kDpFLCqLmTCaJ5N7ZE4h4iVr+QpJ 4x45J9ITZdENqgQJN/Wxwepfm+pUOnWBjlXLSWws= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Elliott, Robert (Servers)" , Zhen Lei , Tejun Heo , "Peter Zijlstra (Intel)" , Josh Don , Andrew Morton , Frederic Weisbecker , "Paul E. McKenney" , Sasha Levin , Elliott Subject: [PATCH 4.19 036/252] genirq: Fix the return type of kstat_cpu_irqs_sum() Date: Fri, 10 Mar 2023 14:36:46 +0100 Message-Id: <20230310133719.922689921@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310133718.803482157@linuxfoundation.org> References: <20230310133718.803482157@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Zhen Lei [ Upstream commit 47904aed898a08f028572b9b5a5cc101ddfb2d82 ] The type of member ->irqs_sum is unsigned long, but kstat_cpu_irqs_sum() returns int, which can result in truncation. Therefore, change the kstat_cpu_irqs_sum() function's return value to unsigned long to avoid truncation. Fixes: f2c66cd8eedd ("/proc/stat: scalability of irq num per cpu") Reported-by: Elliott, Robert (Servers) Signed-off-by: Zhen Lei Cc: Tejun Heo Cc: "Peter Zijlstra (Intel)" Cc: Josh Don Cc: Andrew Morton Reviewed-by: Frederic Weisbecker Signed-off-by: Paul E. McKenney Signed-off-by: Sasha Levin --- include/linux/kernel_stat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 7ee2bb43b251a..f7f20cf1bd3b1 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -73,7 +73,7 @@ extern unsigned int kstat_irqs_usr(unsigned int irq); /* * Number of interrupts per cpu, since bootup */ -static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) +static inline unsigned long kstat_cpu_irqs_sum(unsigned int cpu) { return kstat_cpu(cpu).irqs_sum; } -- 2.39.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 316CCC6FD1F for ; Fri, 10 Mar 2023 14:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231950AbjCJOQt (ORCPT ); Fri, 10 Mar 2023 09:16:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232072AbjCJOQO (ORCPT ); Fri, 10 Mar 2023 09:16:14 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71FFFE387 for ; Fri, 10 Mar 2023 06:15:25 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 32A90B822BA for ; Fri, 10 Mar 2023 14:15:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3249C4339E; Fri, 10 Mar 2023 14:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678457722; bh=ypIDq0iQ70tueb0cdm8lg82AZoQf2hLq1XJqU3C7UQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kkvMt5hNJ0ucmVe9nXcJO21UaaQeDSZHh0RdDl1hVbb6d2fRe6u75BOb7bmUMKD91 OPcvK9dPBlsplwAKF/IEeIP4Q2/+yKXDywJnq8kDpFLCqLmTCaJ5N7ZE4h4iVr+QpJ 4x45J9ITZdENqgQJN/Wxwepfm+pUOnWBjlXLSWws= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Elliott, Robert (Servers)" , Zhen Lei , Tejun Heo , "Peter Zijlstra (Intel)" , Josh Don , Andrew Morton , Frederic Weisbecker , "Paul E. McKenney" , Sasha Levin , Elliott@vger.kernel.org Subject: [PATCH 4.19 036/252] genirq: Fix the return type of kstat_cpu_irqs_sum() Date: Fri, 10 Mar 2023 14:36:46 +0100 Message-Id: <20230310133719.922689921@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310133718.803482157@linuxfoundation.org> References: <20230310133718.803482157@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit 47904aed898a08f028572b9b5a5cc101ddfb2d82 ] The type of member ->irqs_sum is unsigned long, but kstat_cpu_irqs_sum() returns int, which can result in truncation. Therefore, change the kstat_cpu_irqs_sum() function's return value to unsigned long to avoid truncation. Fixes: f2c66cd8eedd ("/proc/stat: scalability of irq num per cpu") Reported-by: Elliott, Robert (Servers) Signed-off-by: Zhen Lei Cc: Tejun Heo Cc: "Peter Zijlstra (Intel)" Cc: Josh Don Cc: Andrew Morton Reviewed-by: Frederic Weisbecker Signed-off-by: Paul E. McKenney Signed-off-by: Sasha Levin --- include/linux/kernel_stat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 7ee2bb43b251a..f7f20cf1bd3b1 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -73,7 +73,7 @@ extern unsigned int kstat_irqs_usr(unsigned int irq); /* * Number of interrupts per cpu, since bootup */ -static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) +static inline unsigned long kstat_cpu_irqs_sum(unsigned int cpu) { return kstat_cpu(cpu).irqs_sum; } -- 2.39.2