From patchwork Thu Aug 20 09:23:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 265686 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, URIBL_BLOCKED, 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 09650C433E1 for ; Thu, 20 Aug 2020 10:26:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8A6D20738 for ; Thu, 20 Aug 2020 10:26:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597919168; bh=Q437UooYHqyuMB4DoGJE8zfj50ppfsPBzBkZQm11MSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xp5EFWezdk2vRde28kG46d7ME/hfQU+FV0c+2rjnCjcXMIOXcc1wSWMuAtsduatpF oSvjpfuYzlZ3AdIW/D1LVrS2QQ4wRg6frG58MMOiZs3fdDn6bZUxIsQw+P/bItiyaD 466X4NFEJWoxgb7pMC5Pm/ILABqoaOrowgQfv7R0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729999AbgHTK0F (ORCPT ); Thu, 20 Aug 2020 06:26:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:51912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729943AbgHTKXL (ORCPT ); Thu, 20 Aug 2020 06:23:11 -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 812392078D; Thu, 20 Aug 2020 10:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918991; bh=Q437UooYHqyuMB4DoGJE8zfj50ppfsPBzBkZQm11MSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yVbonfzJCS0CQiVD9QDqEPsBzjc86TQSRYGLP8C5cnYbJXMheAT1YV9ndY91cHaf9 RqTvYbA9xU3yHezMxGIqYbzEOSQ70gcD/3E8WGjLMkd6fVgW2z8DRdEw7GCfIH4403 qh9Ek6XPc7i8VSMKnqvz9CPRArDOTJ/YMBArqkWY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Andrew Morton , Evgeniy Dushistov , Alexey Dobriyan , Linus Torvalds , Sasha Levin Subject: [PATCH 4.4 144/149] fs/ufs: avoid potential u32 multiplication overflow Date: Thu, 20 Aug 2020 11:23:41 +0200 Message-Id: <20200820092132.670640680@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820092125.688850368@linuxfoundation.org> References: <20200820092125.688850368@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Colin Ian King [ Upstream commit 88b2e9b06381551b707d980627ad0591191f7a2d ] The 64 bit ino is being compared to the product of two u32 values, however, the multiplication is being performed using a 32 bit multiply so there is a potential of an overflow. To be fully safe, cast uspi->s_ncg to a u64 to ensure a 64 bit multiplication occurs to avoid any chance of overflow. Fixes: f3e2a520f5fb ("ufs: NFS support") Signed-off-by: Colin Ian King Signed-off-by: Andrew Morton Cc: Evgeniy Dushistov Cc: Alexey Dobriyan Link: http://lkml.kernel.org/r/20200715170355.1081713-1-colin.king@canonical.com Addresses-Coverity: ("Unintentional integer overflow") Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/ufs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 10f364490833e..be68b48de1cc6 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -99,7 +99,7 @@ static struct inode *ufs_nfs_get_inode(struct super_block *sb, u64 ino, u32 gene struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; struct inode *inode; - if (ino < UFS_ROOTINO || ino > uspi->s_ncg * uspi->s_ipg) + if (ino < UFS_ROOTINO || ino > (u64)uspi->s_ncg * uspi->s_ipg) return ERR_PTR(-ESTALE); inode = ufs_iget(sb, ino);