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 CF7463A1E63 for ; Mon, 29 Dec 2025 21:51:51 +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=1767045111; cv=none; b=iNIo165Tot95LbmOCMuc1HYRrYtR8Mv0V/rOMhYL0d+k08RAvSml69G5dW5+Yrj31Ag4/97NPI/6xjzvCPEN2f7oQfF4z0z0aAfl+O7/PDX9eHqy65oN9jLi3lfXZnM6N5+R143A0zeCxG1sEKWEv7Yt0+vOvE9/xgVaej7Cth8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767045111; c=relaxed/simple; bh=Qs0YcM4GnLPcwBWYtBv4hZZlKTGO0Bpy1RMTEUDPL1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CACm81IljbgCnTquabGM2cZZxqlzhaphLOTKlM4zw8mf1BIMQWpi9gnD5kMcfxWOUOuC/tmicpvx+r+/Pk8WgVS+ugmFNWjbQ0xc4SnDWHPrqbsgpfvBwiINdulOk3IZwL1/j8glY31XQquXkJ4ylprHwqmK9h2nCNiUMeYtD4A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hDDY5vLC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hDDY5vLC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5C25C4CEF7; Mon, 29 Dec 2025 21:51:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767045111; bh=Qs0YcM4GnLPcwBWYtBv4hZZlKTGO0Bpy1RMTEUDPL1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hDDY5vLCsT3bdFU4fnWI1AuzhqA5GtUPsDFRo0QdsuZVD/Ad7eDmNGWXtY6OUpxzt +ikR4EQvA+2Dw7PYNBk6CZkw8nynECw7J2icaszk3MOmw66hVGxJS2msZRHkBoeNp/ 4x2Xfe8H3TMvHEr96/qUpIqcbjKsQC/MGv51ygecZhj7o2g5Z38XEkkk/tsapc+sUO MfTlY3hobw0jSJAI6RYD+ke1C+KQmvsdMbf6ZevmWCq0zE/Arnm4NiEJkOQEcI0xxs 9xkKUdepxO0zTDvTr9VvO8E6DtupYbswEh31665pVk1CLNX95oivSXIkaXQqhaC6Gx 7TjB0una+jnmg== From: Sasha Levin To: stable@vger.kernel.org Cc: Josef Bacik , Johannes Thumshirn , Daniel Vacek , David Sterba , Sasha Levin Subject: [PATCH 6.6.y] btrfs: don't rewrite ret from inode_permission Date: Mon, 29 Dec 2025 16:51:49 -0500 Message-ID: <20251229215149.1729676-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025122955-fever-mustiness-049e@gregkh> References: <2025122955-fever-mustiness-049e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Josef Bacik [ Upstream commit 0185c2292c600993199bc6b1f342ad47a9e8c678 ] In our user safe ino resolve ioctl we'll just turn any ret into -EACCES from inode_permission(). This is redundant, and could potentially be wrong if we had an ENOMEM in the security layer or some such other error, so simply return the actual return value. Note: The patch was taken from v5 of fscrypt patchset (https://lore.kernel.org/linux-btrfs/cover.1706116485.git.josef@toxicpanda.com/) which was handled over time by various people: Omar Sandoval, Sweet Tea Dorminy, Josef Bacik. Fixes: 23d0b79dfaed ("btrfs: Add unprivileged version of ino_lookup ioctl") CC: stable@vger.kernel.org # 5.4+ Reviewed-by: Johannes Thumshirn Signed-off-by: Josef Bacik Signed-off-by: Daniel Vacek Reviewed-by: David Sterba [ add note ] Signed-off-by: David Sterba [ Adjust context ] Signed-off-by: Sasha Levin --- fs/btrfs/ioctl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index ae6806bc3929..71e6715efa14 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2006,10 +2006,8 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap, ret = inode_permission(idmap, temp_inode, MAY_READ | MAY_EXEC); iput(temp_inode); - if (ret) { - ret = -EACCES; + if (ret) goto out_put; - } if (key.offset == upper_limit.objectid) break; -- 2.51.0