From patchwork Tue Aug 30 06:42:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jit Loon Lim X-Patchwork-Id: 1671804 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=VPR9WpSm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MH4tr2md5z1yh5 for ; Tue, 30 Aug 2022 21:33:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EFB184989; Tue, 30 Aug 2022 13:33:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VPR9WpSm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 436DD84932; Tue, 30 Aug 2022 08:42:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=AC_FROM_MANY_DOTS,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 99A2F84832 for ; Tue, 30 Aug 2022 08:42:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=jitloonl@ecsmtp.png.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661841767; x=1693377767; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5euD5NKZFQ/3A7ir4T1oBScYoRBT8CcetJrZ4ba/Evo=; b=VPR9WpSmyUkrNaq+3TYG0Uc+TtzEehXgJ4gIekzPU23ExiHhl9vzmHal EDSaWYkgFo43zmWxegeimpr9K3AZKlZ+Sp2KZQdLSckrUN944XPgMrf56 6dYIvhzhsSJuSwjHC2sYn1vyZfwKUCKeN8PurV8SQ0nGe5U7smvTw3d+0 81aN7yM1onFIQlPfOX7zSE9Va84T7sacMPO0Ao2oMIpUObIg9UnwOwtE6 GRZIG3xEZzDkq77bnZhQDGEtLGuSAPIDvdJSuaGIOEoN0i9sbgvgKoOHP 2cQkbir50seoUBdNHfbuv1oY96MPMji3mKDh2wT2LZsAZrkUif2vGVPc5 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="278114669" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="278114669" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 23:42:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="607730710" Received: from pglmail07.png.intel.com ([10.221.193.207]) by orsmga007.jf.intel.com with ESMTP; 29 Aug 2022 23:42:41 -0700 Received: from localhost (pgli0078.png.intel.com [10.221.240.41]) by pglmail07.png.intel.com (Postfix) with ESMTP id 282352B20; Tue, 30 Aug 2022 14:42:41 +0800 (+08) Received: by localhost (Postfix, from userid 12048045) id 23AEC2982; Tue, 30 Aug 2022 14:42:41 +0800 (+08) From: Jit Loon Lim To: u-boot@lists.denx.de Cc: Jagan Teki , Vignesh R , Marek , Simon , Tien Fong , Kok Kiang , Siew Chin , Sin Hui , Raaj , Dinesh , Boon Khai , Alif , Teik Heng , Hazim , Sieu Mun Tang , Jit Loon Lim Subject: [PATCH] ddr: socfpga: Fix integer overflow Date: Tue, 30 Aug 2022 14:42:39 +0800 Message-Id: <20220830064239.25340-1-jit.loon.lim@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 30 Aug 2022 13:32:57 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Tien Fong Chee dramaddrw data structure are defined as u32. Compiler assume 32-bit arithmetic on expression and the shifting operation to be done on a 32-bit value. So, the expression would overflow if the shifting is more than 32-bit. Signed-off-by: Tien Fong Chee --- drivers/ddr/altera/sdram_soc64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 9b1710c135..81ad02118b 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -246,7 +246,7 @@ phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat) DRAMADDRW_CFG_ROW_ADDR_WIDTH(dramaddrw) + DRAMADDRW_CFG_COL_ADDR_WIDTH(dramaddrw)); - size *= (2 << (hmc_ecc_readl(plat, DDRIOCTRL) & + size *= ((phys_size_t)2 << (hmc_ecc_readl(plat, DDRIOCTRL) & DDR_HMC_DDRIOCTRL_IOSIZE_MSK)); return size;