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 8D7303B5820; Mon, 23 Mar 2026 15:11:45 +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=1774278705; cv=none; b=PFnnlYTPMI2Cv3BxOessxakBpB4qBonMIfUD1hyS1XYwFgMClSClTr8P/ahwDEv6DCMAHyw4jDqupp62vy+HFVo5z/3no3fKj56uQvx+UjW6OXGvgCxWfRcMqloEkhymPWwvy3Abn55zqh/qybUVP3VW3UW39dSMy7dlZvATWaE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774278705; c=relaxed/simple; bh=SMHLygjbtTvWlb/4Y1Bo62OWj39W9dKlRetSlf+TBI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Av0sLOQsHa2U/qIddLyH3ImHvqEYHbPoU+6SNOWNRQni/e2VB+pXfDHHebI/3n3yl6TH9kllqLNX6jKB17zdC3lCRrepTkavyMqdbqiQWilSe9Y7Sx8bnos8eOwbyw+MAqFITDaATg5DcZQ46DJLD9qmk89W6e3xGDOx7tIkHWs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TlHZjAiK; 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="TlHZjAiK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11221C4CEF7; Mon, 23 Mar 2026 15:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774278705; bh=SMHLygjbtTvWlb/4Y1Bo62OWj39W9dKlRetSlf+TBI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlHZjAiKT3XbuwD/Tzr+QcDb57/kNon1cdQnunUcd62aYASPTBYaci9KRq6nYTX0a EeEw4YHwnpQmL7XaWiMrciJ5f+MmFeTZHmRCkSkxjZ9ooVUy74j7PzFSi+A6k0S1qJ FTShj9tP0xVJSiC9vSN90MTQKVe9CW0w+K6bMYxQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Long Li , "Darrick J. Wong" , Carlos Maiolino , Sasha Levin Subject: [PATCH 6.6 393/567] xfs: fix integer overflow in bmap intent sort comparator Date: Mon, 23 Mar 2026 14:45:13 +0100 Message-ID: <20260323134543.581549379@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134533.749096647@linuxfoundation.org> References: <20260323134533.749096647@linuxfoundation.org> User-Agent: quilt/0.69 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 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Long Li [ Upstream commit 362c490980867930a098b99f421268fbd7ca05fd ] xfs_bmap_update_diff_items() sorts bmap intents by inode number using a subtraction of two xfs_ino_t (uint64_t) values, with the result truncated to int. This is incorrect when two inode numbers differ by more than INT_MAX (2^31 - 1), which is entirely possible on large XFS filesystems. Fix this by replacing the subtraction with cmp_int(). Cc: # v4.9 Fixes: 9f3afb57d5f1 ("xfs: implement deferred bmbt map/unmap operations") Signed-off-by: Long Li Reviewed-by: Darrick J. Wong Signed-off-by: Carlos Maiolino [ replaced `bi_entry()` macro with `container_of()` and inlined `cmp_int()` as a manual three-way comparison expression ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/xfs/xfs_bmap_item.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/xfs/xfs_bmap_item.c +++ b/fs/xfs/xfs_bmap_item.c @@ -278,7 +278,8 @@ xfs_bmap_update_diff_items( ba = container_of(a, struct xfs_bmap_intent, bi_list); bb = container_of(b, struct xfs_bmap_intent, bi_list); - return ba->bi_owner->i_ino - bb->bi_owner->i_ino; + return (ba->bi_owner->i_ino > bb->bi_owner->i_ino) - + (ba->bi_owner->i_ino < bb->bi_owner->i_ino); } /* Set the map extent flags for this mapping. */