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 3CB4C3A3E75 for ; Tue, 17 Mar 2026 12:56:17 +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=1773752177; cv=none; b=pefBa/7q6jbj2gEPg9uZWPEoWI/mkqNtumM4p7B8BAdLly7iwYs7eJ9Zr3m4CpgtIO+OVRbeKPuQbuMd3ZHGStalICMdANAXgL3/lL+lKVd9oq/WuS+/G6sceTTfK+Eg5DgdTLGCKhNHR2VSuwnR/oImRaIeBGy7NjP75sR7rvk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773752177; c=relaxed/simple; bh=bR65diDdR/sE4nMLHjsTCAmz+x/Fkfv7ME9V/jRscrw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=QhLF2lwQ+KSP3tu/oduaTHe7u6TY9mG4umNuQ8aTk4zDwa2uj+ByansTc1slsf2THEJpwkqCRSGEto13n7Y2IEIl5Xw7jirFRe3J4GEuFN/mpY1Q7P8+WeCaolN36z8g/rgAZFXm1NC3J937dzOn7tzupA/FUHtxvTJSQd8fC5M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=j2S+6EVT; 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="j2S+6EVT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2464C2BC86; Tue, 17 Mar 2026 12:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773752177; bh=bR65diDdR/sE4nMLHjsTCAmz+x/Fkfv7ME9V/jRscrw=; h=Subject:To:Cc:From:Date:From; b=j2S+6EVTvdSGIL3zedOdlhWVD0seCtNb0/k7pLmoZ+DIrKOvKgQS3m3VVyVczYOuU 1r7mstQT6QdrJPsHyCC+lBlN2/2mi37lTcTr0ogLF1OmZEthC99ORgxps2PSkPohKi qVtbcNWJVtPrBzJszO3LnA6Mg+TMhXORJhnakvxs= Subject: FAILED: patch "[PATCH] xfs: fix integer overflow in bmap intent sort comparator" failed to apply to 6.6-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:13 +0100 Message-ID: <2026031713-nectar-disparity-ab02@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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x 362c490980867930a098b99f421268fbd7ca05fd # git commit -s git send-email --to '' --in-reply-to '2026031713-nectar-disparity-ab02@gregkh' --subject-prefix 'PATCH 6.6.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. */