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 415894C62; Wed, 21 Feb 2024 14:19:58 +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=1708525198; cv=none; b=Sg0QpZ9+zRDnR+GrD99dHkZ/0VzfXduLEvFjYnqjdcCx0AzMzlkgmkuGHBqP8rjqvc0x3zTkZdAupggvHGJMdMpDiClPA9s1w/xfXjz9+wQbivkKC4fejBXLPWuszI+1Wiq2BrBVo6J/+pomTWr5r8B5+GxIQObB+lNDV7Et5wI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708525198; c=relaxed/simple; bh=YQCOLen3U86Jq6RBC+4TFQj0jzEjX7i/djZ2KhxFuCI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KF1HHi+kmZ7EiqoqHojQO5TWAGopmf6ZtyB5pcwEZN1GbTHnEfha6A58wzZosPSE1xTY63p7AOcStbVxQFZnf8BhXnzW77KntMuRnhEWjCERF8Or2QCluvrZwF2fXxvwCxAGVRXne6vWv0i8ejjXf+OtnPvTW3GAtRwDgOguBJs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DVLvwnIR; 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="DVLvwnIR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5247C433F1; Wed, 21 Feb 2024 14:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708525198; bh=YQCOLen3U86Jq6RBC+4TFQj0jzEjX7i/djZ2KhxFuCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DVLvwnIRgA92bVxcGTlp7lCFMAVB9jwru9dS2o2rTPtDT1dLK6XqiLZ6pnX/yJyJe Zgtq+kKnDgCW1RYKYZukr0x7HDkJq15AKSSHhN0jGTdrU0nmZM+e2CKHBwg/SbtZbG 3rYMhe3hpjnxRxFc0PVjBtFkPqR9+dRvNpC53hqE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Baokun Li , Jan Kara , Theodore Tso , Sasha Levin Subject: [PATCH 5.4 089/267] ext4: remove unnecessary check from alloc_flex_gd() Date: Wed, 21 Feb 2024 14:07:10 +0100 Message-ID: <20240221125942.753830692@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221125940.058369148@linuxfoundation.org> References: <20240221125940.058369148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Baokun Li [ Upstream commit b099eb87de105cf07cad731ded6fb40b2675108b ] In commit 967ac8af4475 ("ext4: fix potential integer overflow in alloc_flex_gd()"), an overflow check is added to alloc_flex_gd() to prevent the allocated memory from being smaller than expected due to the overflow. However, after kmalloc() is replaced with kmalloc_array() in commit 6da2ec56059c ("treewide: kmalloc() -> kmalloc_array()"), the kmalloc_array() function has an overflow check, so the above problem will not occur. Therefore, the extra check is removed. Signed-off-by: Baokun Li Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20231023013057.2117948-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/resize.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index ae768fdbafa8..682596f3205f 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -245,10 +245,7 @@ static struct ext4_new_flex_group_data *alloc_flex_gd(unsigned int flexbg_size) if (flex_gd == NULL) goto out3; - if (flexbg_size >= UINT_MAX / sizeof(struct ext4_new_group_data)) - goto out2; flex_gd->count = flexbg_size; - flex_gd->groups = kmalloc_array(flexbg_size, sizeof(struct ext4_new_group_data), GFP_NOFS); -- 2.43.0