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 82A291714D0; Thu, 15 Aug 2024 13:30:34 +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=1723728634; cv=none; b=ar5GDxQh/nSFVkveL06bMrvUIV0A1F3egRuKAkjbjklypANaZt0MIHzHQNcWbE1Ibvta6PjhqweHVbudtALV0AXXnSdLApJ678VEsjEoRWFQ9JcsZu/FSxhZAPqESUqsnf2a2xT4bJQbTYAtlU6zyytkqq3IWiX262UTVctoFg0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723728634; c=relaxed/simple; bh=Wc58GbuW6E0V1fPhENk6kdMLtB4ylouaqJGqud4G6wk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PZGjknRqERk08V/HGjYTbLnh4bThctGcTaCplng/5SD80mirsDR9JgYFZvxKd3na6drvuzlftqXo63YJ601kXGodiqFdjSQTPRMmHeePNx2tsv6AMsdviCeLmpP7OvlxY2TaC011plfqztA285Olvo7VsI4oeu4YsXFu7CESD9M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aplbmylC; 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="aplbmylC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B850C32786; Thu, 15 Aug 2024 13:30:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723728634; bh=Wc58GbuW6E0V1fPhENk6kdMLtB4ylouaqJGqud4G6wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aplbmylCnNQsgTJQz0Butb8ULe/COPi+35ft/Hnl7W5ZvV+Rcbmob932k1bHKsvXR mdlpbkLf83DiZv0YFVa3HtTKZWRyVBAMJ9fyKgBwpEAUbYZZ/uUUIR1KFLPcfPno7A LpHWXUYQxAI5lOLKOWCSbXM20Xvg2USQFTXTgCvA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ryusuke Konishi , Andrew Morton , Sasha Levin Subject: [PATCH 4.19 061/196] nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro Date: Thu, 15 Aug 2024 15:22:58 +0200 Message-ID: <20240815131854.411365005@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131852.063866671@linuxfoundation.org> References: <20240815131852.063866671@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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ryusuke Konishi [ Upstream commit 0f3819e8c483771a59cf9d3190cd68a7a990083c ] According to the C standard 3.4.3p3, the result of signed integer overflow is undefined. The macro nilfs_cnt32_ge(), which compares two sequence numbers, uses signed integer subtraction that can overflow, and therefore the result of the calculation may differ from what is expected due to undefined behavior in different environments. Similar to an earlier change to the jiffies-related comparison macros in commit 5a581b367b5d ("jiffies: Avoid undefined behavior from signed overflow"), avoid this potential issue by changing the definition of the macro to perform the subtraction as unsigned integers, then cast the result to a signed integer for comparison. Link: https://lkml.kernel.org/r/20130727225828.GA11864@linux.vnet.ibm.com Link: https://lkml.kernel.org/r/20240702183512.6390-1-konishi.ryusuke@gmail.com Fixes: 9ff05123e3bf ("nilfs2: segment constructor") Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/nilfs2/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 62c83193a5bb8..3c4272762779c 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -136,7 +136,7 @@ static void nilfs_dispose_list(struct the_nilfs *, struct list_head *, int); #define nilfs_cnt32_ge(a, b) \ (typecheck(__u32, a) && typecheck(__u32, b) && \ - ((__s32)(a) - (__s32)(b) >= 0)) + ((__s32)((a) - (b)) >= 0)) static int nilfs_prepare_segment_lock(struct super_block *sb, struct nilfs_transaction_info *ti) -- 2.43.0