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 75D1A1D0493; Wed, 2 Oct 2024 14:47:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880451; cv=none; b=aG8kVN3vjO9OvbZa+xAvmDQbRBFQ0Y8KQNUKTobJGjh7BfmPCVlIyr7E6lEhQhly5JPMxuPoKnhwR4c2XkuS4kM40qolRHLxIWyoGKABupPCyHwm7Yr4P1KY/tFonl+1APbaARb5xwEGqGvHvEeiyi6ssfuoaVIqv88TvAaYHmM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880451; c=relaxed/simple; bh=2ft3TVbKs2IC9R5Jyo12htJC0wnhhZMZTv1hbYnyAoU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jIat29Ga+RsVRNaGN/pQEK9JuWUpMIlBvHjjzSQz0ikpCDsOTaYncX2xpJLHlf/Ar8xHcuGxcA4gCq9cuiaKAllK58iz1FNjvbFj4eCXXgfwRYq6dTB2RvsBoEndXXCdplMTOibgiuqXKUrKrDXZqZVfZjDRZm5NHueklDMKQjE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Qq+4NdvD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Qq+4NdvD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F27FEC4CEC2; Wed, 2 Oct 2024 14:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727880451; bh=2ft3TVbKs2IC9R5Jyo12htJC0wnhhZMZTv1hbYnyAoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qq+4NdvD/pxfD0gLMbWEYHEHegIdqZ9tKtgMbcPKWGzu2w33XnnMHqQ6aEEm3JTWw zb8jMu5Ol2k2IBzxDSRreiuu9GlMxCrnqiDh4QMJPqufRZLdZ58OSAJIBD8HYlwCnX 3NWAFBcwwPKtzYDVpR0HYLldAj4EI+3USUwcmWmg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nikita Zhandarovich , Chao Yu , Jaegeuk Kim Subject: [PATCH 6.6 462/538] f2fs: prevent possible int overflow in dir_block_index() Date: Wed, 2 Oct 2024 15:01:41 +0200 Message-ID: <20241002125810.680925979@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125751.964700919@linuxfoundation.org> References: <20241002125751.964700919@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nikita Zhandarovich commit 47f268f33dff4a5e31541a990dc09f116f80e61c upstream. The result of multiplication between values derived from functions dir_buckets() and bucket_blocks() *could* technically reach 2^30 * 2^2 = 2^32. While unlikely to happen, it is prudent to ensure that it will not lead to integer overflow. Thus, use mul_u32_u32() as it's more appropriate to mitigate the issue. Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE. Fixes: 3843154598a0 ("f2fs: introduce large directory support") Cc: stable@vger.kernel.org Signed-off-by: Nikita Zhandarovich Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -157,7 +157,8 @@ static unsigned long dir_block_index(uns unsigned long bidx = 0; for (i = 0; i < level; i++) - bidx += dir_buckets(i, dir_level) * bucket_blocks(i); + bidx += mul_u32_u32(dir_buckets(i, dir_level), + bucket_blocks(i)); bidx += idx * bucket_blocks(level); return bidx; }