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 0A8C8192B66 for ; Sun, 21 Sep 2025 12:25:46 +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=1758457546; cv=none; b=nvI1Sr7lk5OrmqkfWtrty8oYE9/exDEmxxhwUpCod+yXRKPHIk77oC1N0oBwESti+LctA8mpnJxQgs152DxWsLMheMVH1sFriNR8Zuru04MPLbrkRfEl9yGDa/UZ/qOFbdNj4EsdshzE4mo91C+UIsP8kQzPxSraZFSHt/LhFPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758457546; c=relaxed/simple; bh=GITBCkfguthpUemx9ZjzmZjpEqz+1flpDHO+G9pRSt0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=sJPZR7nDS8OW1sPn6Jr+8brCKVlf15F5SSHdmWi35e7boE9d+JZpa+9ccAIEtEL/wpqRLGOUvvxZ8F89eW2cBhcnlojkMiEJlxBa45+QHXCmwDa8+63vj6Jk0EpWyUHDXQa/iLv53cui4eUyNDEinzqD9/ppIch5+1MI6Uz6CnU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uimYQq5r; 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="uimYQq5r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9690DC4CEE7; Sun, 21 Sep 2025 12:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758457545; bh=GITBCkfguthpUemx9ZjzmZjpEqz+1flpDHO+G9pRSt0=; h=Subject:To:Cc:From:Date:From; b=uimYQq5rvdlLzWrcYG6mm1rscSW8kdSYNFXhC8b9OvL94BR5Kc+SlgNj6GpTT9CqZ Qf/DY+cZbM38CwWE3JLYBhgio4YDXXB7s3e+w3/FxC8ygBj+mcEsssouvzTy3Gmv0b CYHN37nPi7g+1GQq8tVEcWiQUODMP6DhZbfFj4GU= Subject: FAILED: patch "[PATCH] btrfs: tree-checker: fix the incorrect inode ref size check" failed to apply to 5.4-stable tree To: wqu@suse.com,dsterba@suse.com,fdmanana@suse.com,johannes.thumshirn@wdc.com Cc: From: Date: Sun, 21 Sep 2025 14:25:35 +0200 Message-ID: <2025092135-breeding-chrome-585a@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 5.4-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-5.4.y git checkout FETCH_HEAD git cherry-pick -x 96fa515e70f3e4b98685ef8cac9d737fc62f10e1 # git commit -s git send-email --to '' --in-reply-to '2025092135-breeding-chrome-585a@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 96fa515e70f3e4b98685ef8cac9d737fc62f10e1 Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Tue, 16 Sep 2025 07:54:06 +0930 Subject: [PATCH] btrfs: tree-checker: fix the incorrect inode ref size check [BUG] Inside check_inode_ref(), we need to make sure every structure, including the btrfs_inode_extref header, is covered by the item. But our code is incorrectly using "sizeof(iref)", where @iref is just a pointer. This means "sizeof(iref)" will always be "sizeof(void *)", which is much smaller than "sizeof(struct btrfs_inode_extref)". This will allow some bad inode extrefs to sneak in, defeating tree-checker. [FIX] Fix the typo by calling "sizeof(*iref)", which is the same as "sizeof(struct btrfs_inode_extref)", and will be the correct behavior we want. Fixes: 71bf92a9b877 ("btrfs: tree-checker: Add check for INODE_REF") CC: stable@vger.kernel.org # 6.1+ Reviewed-by: Johannes Thumshirn Reviewed-by: Filipe Manana Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index 0f556f4de3f9..a997c7cc35a2 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -1756,10 +1756,10 @@ static int check_inode_ref(struct extent_buffer *leaf, while (ptr < end) { u16 namelen; - if (unlikely(ptr + sizeof(iref) > end)) { + if (unlikely(ptr + sizeof(*iref) > end)) { inode_ref_err(leaf, slot, "inode ref overflow, ptr %lu end %lu inode_ref_size %zu", - ptr, end, sizeof(iref)); + ptr, end, sizeof(*iref)); return -EUCLEAN; }