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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1478DC433DF for ; Mon, 17 Aug 2020 18:48:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC882207DF for ; Mon, 17 Aug 2020 18:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597690134; bh=qdbaxaqAipz0TJG72rVuGZ2oH2GletrRjHby+KTDcls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AXLNaedYkwWB4gsbbmysHFQL7tT0BwYFKQehca4E745Z5Dkn+0A1xXq+yMx/g69w/ +V0xtKTSy7LRFq13DU8gRwUF2zrwEIWm4y6/9Ce9jsIeBzfItE7NXosaP7GgUIHNZf wY0OXitb19WGZAJGWfc2aGb9jxPtiC3dYdl5ZcNE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403846AbgHQSsv (ORCPT ); Mon, 17 Aug 2020 14:48:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:42484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387725AbgHQPyq (ORCPT ); Mon, 17 Aug 2020 11:54:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C751E2072E; Mon, 17 Aug 2020 15:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679686; bh=qdbaxaqAipz0TJG72rVuGZ2oH2GletrRjHby+KTDcls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2sFlAzpUXd3XpM4M1xi/NH8x/hbR/jBLbCcHtZJRIOJfvzOKQTqAI1VY0TZzji6S GIa3nmkNkqHTOtnubs/znO/gj+OaJ9wf2QCGyMVgfqG2b6NqKPpA0SOJ9l1FQlms/+ eNx4WdT5ftdpzOr1A980wbLcb9La0WkpCc/TsLwk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florinel Iordache , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 300/393] fsl/fman: use 32-bit unsigned integer Date: Mon, 17 Aug 2020 17:15:50 +0200 Message-Id: <20200817143834.168239056@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florinel Iordache [ Upstream commit 99f47abd9f7bf6e365820d355dc98f6955a562df ] Potentially overflowing expression (ts_freq << 16 and intgr << 16) declared as type u32 (32-bit unsigned) is evaluated using 32-bit arithmetic and then used in a context that expects an expression of type u64 (64-bit unsigned) which ultimately is used as 16-bit unsigned by typecasting to u16. Fixed by using an unsigned 32-bit integer since the value is truncated anyway in the end. Fixes: 414fd46e7762 ("fsl/fman: Add FMan support") Signed-off-by: Florinel Iordache Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/fman/fman.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index f151d6e111dd9..ef67e8599b393 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -1398,8 +1398,7 @@ static void enable_time_stamp(struct fman *fman) { struct fman_fpm_regs __iomem *fpm_rg = fman->fpm_regs; u16 fm_clk_freq = fman->state->fm_clk_freq; - u32 tmp, intgr, ts_freq; - u64 frac; + u32 tmp, intgr, ts_freq, frac; ts_freq = (u32)(1 << fman->state->count1_micro_bit); /* configure timestamp so that bit 8 will count 1 microsecond -- 2.25.1