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 C35DF3C0602 for ; Tue, 17 Mar 2026 12:56:25 +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=1773752185; cv=none; b=Fr9k6WxXLrh7reGkl6qzpVXIdBgrv+mGEfQ792AxI1lUb9jQOTQmeSaM6c1en8/CWdt8okkPQ6y1ME65h3dDbEnRsKIIxXXgKnV0JDUkNSiayyJZegl8VfiOd6Q1oUZ6AOtmFkNNbK8RDB9WtLS/r1znxfdsN5RMXlHFq/x327E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773752185; c=relaxed/simple; bh=8mhAHkcJaiEY1h9K/EwH3arTxdxnqPyUrWwVdT8qaLo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=PMsz0BKMXz1yDrwxd6mivJOXeII+AesOgnvgQ+zyfSi1iG/16KGkHvxjCSr0sUHei+IaiOHT4Tg5Fh+HbwB/bML+vs72xjSZmTH729YfELsYcW1dNMktISxzy3oiiLjwreEiqdHuPIP4GOQ9blZbzbfkMEx7NqRijESXruYUfBs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WnYPtz6+; 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="WnYPtz6+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CA22C4CEF7; Tue, 17 Mar 2026 12:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773752185; bh=8mhAHkcJaiEY1h9K/EwH3arTxdxnqPyUrWwVdT8qaLo=; h=Subject:To:Cc:From:Date:From; b=WnYPtz6+P+jR5cnk8pdaS1vAQwlnRIXY1fTGCf75RT7rzG7/BhUJhe96eXz3dKfuL kL8/jVkJ3VWtBpXvv/tECdbogfJCB15bflO38GNk4wdv/e7LwL6bU+Gf1Oj8U/Psw0 lEdS9GM1GM7UJyPOPKD3LMoBiBOm8bssRPBFANBo= Subject: FAILED: patch "[PATCH] xfs: fix integer overflow in bmap intent sort comparator" failed to apply to 6.1-stable tree To: leo.lilong@huawei.com,cem@kernel.org,djwong@kernel.org,stable@vger.kernel.org Cc: From: Date: Tue, 17 Mar 2026 13:56:14 +0100 Message-ID: <2026031714-whiff-catalyst-aa41@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 362c490980867930a098b99f421268fbd7ca05fd # git commit -s git send-email --to '' --in-reply-to '2026031714-whiff-catalyst-aa41@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 362c490980867930a098b99f421268fbd7ca05fd Mon Sep 17 00:00:00 2001 From: Long Li Date: Tue, 10 Mar 2026 20:32:33 +0800 Subject: [PATCH] xfs: fix integer overflow in bmap intent sort comparator 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 diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c index e8775f254c89..b237a25d6045 100644 --- a/fs/xfs/xfs_bmap_item.c +++ b/fs/xfs/xfs_bmap_item.c @@ -245,7 +245,7 @@ xfs_bmap_update_diff_items( struct xfs_bmap_intent *ba = bi_entry(a); struct xfs_bmap_intent *bb = bi_entry(b); - return ba->bi_owner->i_ino - bb->bi_owner->i_ino; + return cmp_int(ba->bi_owner->i_ino, bb->bi_owner->i_ino); } /* Log bmap updates in the intent item. */