From patchwork Mon Feb 10 12:38:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13967771 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 215DE222575; Mon, 10 Feb 2025 12:39:12 +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=1739191152; cv=none; b=Tm1mL07qrHUQGvW4p+XcwKrT6waVeWDvnBYofF/KxTIUju9mEjR05n0ko430ly29/EtFhWcGkBfT4MB9B9MbKyUfU/VaFntzsloPPmli9y7sxjmRBo3pbIZmRqItlx6xnExrWMz/orLJwccbpa19YsRpu8AU7mvTNtkwxUJGN+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739191152; c=relaxed/simple; bh=WBQB0hQsS8wj6sXR0LdPoQXO+BSkN20LwUKgMV/+DiY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TgcoRbSP7DUakUlm5XZ9LCN2QpHvMrsxvc/V/SN2UCWNs0YlummTIennAVDVwty/7/KNXDxMBJ7kC4AP8Dj5ay1MHsc5A7v1WVZsOsGApsTPWURPMLJByFg8F4ru6YwhZWGtZDI9B+Vd5QI+RvQwS4DjDCUAmOt1l8XWz7SB/FQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hnKKrWah; 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="hnKKrWah" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C660C4CEE5; Mon, 10 Feb 2025 12:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739191151; bh=WBQB0hQsS8wj6sXR0LdPoQXO+BSkN20LwUKgMV/+DiY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hnKKrWah+jp5rQmyRNET7EBrrGDFtp2IC+HwRIDCxTOgnyTsjcD6aOaNWylgXIAzz B8zxjcnvWm3ARn5sJXeyaxJfiV5yrUJEimSGHZswEwhCSGjWMNUXCYdkpzGdSN9iXy 4022e1LiRjffbBKrIiY8Of6a6DunPgWNbGR8qwQZecYPXCsMV5n65uihXNhVkFvOfN F+ChdcwAr6RGfDm5BYMnkzPbFWog+2p7lo6ub5kRA1rFyMXeuTun0UNvotp6LDsIEF terWaWex7Ti7WUA5nmdzocClXx8YPGaet11Hi0qLhwdD3pUQ5fzCVcc4QjZvPeFM5D mVk23RZsCYt5Q== From: Christian Brauner Date: Mon, 10 Feb 2025 13:38:59 +0100 Subject: [PATCH v2 1/2] fs: support O_PATH fds with FSCONFIG_SET_FD Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250210-work-overlayfs-v2-1-ed2a949b674b@kernel.org> References: <20250210-work-overlayfs-v2-0-ed2a949b674b@kernel.org> In-Reply-To: <20250210-work-overlayfs-v2-0-ed2a949b674b@kernel.org> To: linux-unionfs@vger.kernel.org Cc: Miklos Szeredi , Amir Goldstein , Mike Baynton , linux-fsdevel@vger.kernel.org, Christian Brauner X-Mailer: b4 0.15-dev-d23a9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1420; i=brauner@kernel.org; h=from:subject:message-id; bh=WBQB0hQsS8wj6sXR0LdPoQXO+BSkN20LwUKgMV/+DiY=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaSv/JwzLd5D8t26L1cDD7R9cF32qez/749X0201HrHJ8 Fnf+i+o2FHKwiDGxSArpsji0G4SLrecp2KzUaYGzBxWJpAhDFycAjARf1aGfyqB6clrolyvrz7W 8GHdX+8zJ+xTPjbmVHmVNbsWBvklhjD84Tzgnb5OSv1/Wsi2FWtlOd/t7J8mWCr1j6Hm1ganhdI mrAA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Let FSCONFIG_SET_FD handle O_PATH file descriptors. This is particularly useful in the context of overlayfs where layers can be specified via file descriptors instead of paths. But userspace must currently use non-O_PATH file desriptors which is often pointless especially if the file descriptors have been created via open_tree(OPEN_TREE_CLONE). Fixes: a08557d19ef41 ("ovl: specify layers via file descriptors") Signed-off-by: Christian Brauner Reviewed-by: Amir Goldstein --- fs/autofs/autofs_i.h | 2 ++ fs/fsopen.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index 77c7991d89aa..23cea74f9933 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h @@ -218,6 +218,8 @@ void autofs_clean_ino(struct autofs_info *); static inline int autofs_check_pipe(struct file *pipe) { + if (pipe->f_mode & FMODE_PATH) + return -EINVAL; if (!(pipe->f_mode & FMODE_CAN_WRITE)) return -EINVAL; if (!S_ISFIFO(file_inode(pipe)->i_mode)) diff --git a/fs/fsopen.c b/fs/fsopen.c index 094a7f510edf..1aaf4cb2afb2 100644 --- a/fs/fsopen.c +++ b/fs/fsopen.c @@ -453,7 +453,7 @@ SYSCALL_DEFINE5(fsconfig, case FSCONFIG_SET_FD: param.type = fs_value_is_file; ret = -EBADF; - param.file = fget(aux); + param.file = fget_raw(aux); if (!param.file) goto out_key; param.dirfd = aux; From patchwork Mon Feb 10 12:39:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13967772 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 D957B222575; Mon, 10 Feb 2025 12:39:13 +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=1739191154; cv=none; b=hzKLHCJzzhnFYViqDL1+Wf75tL0SSl6JSAEyKcpxz5rW7qmfZ4uu47UkhgatfPY0oA2AisxFUhMD4N3nmxwKVb2gYlwhTt9OzmA/8YQoOqbw1Lv6S8NEfTNPS5qa4sjvUBXbF6G4QQbp31rnRrXBqJIodfOecXtD8h20g2ZLOXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739191154; c=relaxed/simple; bh=ljIOXA2bPardzFGibNKxD83ReIm1uSuY3/J//GCCwjI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hxeg71kEfFrwsof+v1OOt878x6GCfnbGEvWLBz97k4aWKSXPGXuVGT6tbT16bW6WrqVoT4qvhT2TJT1I7WSQNIHKsKleksOxCvjMDTS6X30TjSjlBIY+qkBeIGX7Nrlg6xWcKH7yK6yYLDf0W9hX3tP+luSrJuNWTI3ev+5Epck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gQj1zgh/; 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="gQj1zgh/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A145C4CEDF; Mon, 10 Feb 2025 12:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739191153; bh=ljIOXA2bPardzFGibNKxD83ReIm1uSuY3/J//GCCwjI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gQj1zgh/XuVpah/4rMm12Of2bVI5ZavQN16MK/rZjq1hYIY2UJ7k8M19DR9cnC1R5 KDZj1tjEOW4yBRQjSHZ2TNC/N94Krz4ktiw3fut/lY5I1YvBX3+di5e4kL3GyINTlZ jCeiQsSk8oFlYz6/6q982wGVh+A7Xw+iwAEjQXU/+F6ltP5oYVk+H1nipFsW0RiSic pGj6vSKMNNphS6h9ROHwQoNdCbelWbcHHastdDKacb/tKxq71M9jmGORLodj/T6Vpc snA1lD9yP7KLuQAP1bSHHi85AmyAJ0f5PCJfiKZXidwHXWPKFcX1cJekvs6tczv4+g P8i1NnegESUGw== From: Christian Brauner Date: Mon, 10 Feb 2025 13:39:00 +0100 Subject: [PATCH v2 2/2] selftests/overlayfs: test specifying layers as O_PATH file descriptors Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250210-work-overlayfs-v2-2-ed2a949b674b@kernel.org> References: <20250210-work-overlayfs-v2-0-ed2a949b674b@kernel.org> In-Reply-To: <20250210-work-overlayfs-v2-0-ed2a949b674b@kernel.org> To: linux-unionfs@vger.kernel.org Cc: Miklos Szeredi , Amir Goldstein , Mike Baynton , linux-fsdevel@vger.kernel.org, Christian Brauner X-Mailer: b4 0.15-dev-d23a9 X-Developer-Signature: v=1; a=openpgp-sha256; l=3028; i=brauner@kernel.org; h=from:subject:message-id; bh=ljIOXA2bPardzFGibNKxD83ReIm1uSuY3/J//GCCwjI=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaSv/Jyz/5LUzFLRtUufZ1Tts97bNemsRmSn9ZP5bZtPu XdXGxe/6ihlYRDjYpAVU2RxaDcJl1vOU7HZKFMDZg4rE8gQBi5OAZjIDmOGf9ZuTyt0ONlCvRw1 Nlv4NKpoCj13MP26b5/ATO451fNDDRgZNn+7+kjlzIZtUZ+r1y7eqbDwscO5TedfJhw9Wl1wZMJ ETX4A X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Verify that userspace can specify layers via O_PATH file descriptors. Reviewed-by: Amir Goldstein Signed-off-by: Christian Brauner --- .../filesystems/overlayfs/set_layers_via_fds.c | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c b/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c index 1d0ae785a667..e693e4102d22 100644 --- a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c +++ b/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c @@ -214,4 +214,69 @@ TEST_F(set_layers_via_fds, set_500_layers_via_fds) ASSERT_EQ(close(fd_overlay), 0); } +TEST_F(set_layers_via_fds, set_500_layers_via_opath_fds) +{ + int fd_context, fd_tmpfs, fd_overlay, fd_work, fd_upper, fd_lower; + int layer_fds[500] = { [0 ... 499] = -EBADF }; + + ASSERT_EQ(unshare(CLONE_NEWNS), 0); + ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0); + + fd_context = sys_fsopen("tmpfs", 0); + ASSERT_GE(fd_context, 0); + + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0); + fd_tmpfs = sys_fsmount(fd_context, 0, 0); + ASSERT_GE(fd_tmpfs, 0); + ASSERT_EQ(close(fd_context), 0); + + for (int i = 0; i < ARRAY_SIZE(layer_fds); i++) { + char path[100]; + + sprintf(path, "l%d", i); + ASSERT_EQ(mkdirat(fd_tmpfs, path, 0755), 0); + layer_fds[i] = openat(fd_tmpfs, path, O_DIRECTORY | O_PATH); + ASSERT_GE(layer_fds[i], 0); + } + + ASSERT_EQ(mkdirat(fd_tmpfs, "w", 0755), 0); + fd_work = openat(fd_tmpfs, "w", O_DIRECTORY | O_PATH); + ASSERT_GE(fd_work, 0); + + ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0); + fd_upper = openat(fd_tmpfs, "u", O_DIRECTORY | O_PATH); + ASSERT_GE(fd_upper, 0); + + ASSERT_EQ(mkdirat(fd_tmpfs, "l501", 0755), 0); + fd_lower = openat(fd_tmpfs, "l501", O_DIRECTORY | O_PATH); + ASSERT_GE(fd_lower, 0); + + ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/tmp", MOVE_MOUNT_F_EMPTY_PATH), 0); + ASSERT_EQ(close(fd_tmpfs), 0); + + fd_context = sys_fsopen("overlay", 0); + ASSERT_GE(fd_context, 0); + + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir", NULL, fd_work), 0); + ASSERT_EQ(close(fd_work), 0); + + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir", NULL, fd_upper), 0); + ASSERT_EQ(close(fd_upper), 0); + + for (int i = 0; i < ARRAY_SIZE(layer_fds); i++) { + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[i]), 0); + ASSERT_EQ(close(layer_fds[i]), 0); + } + + ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, fd_lower), 0); + ASSERT_EQ(close(fd_lower), 0); + + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0); + + fd_overlay = sys_fsmount(fd_context, 0, 0); + ASSERT_GE(fd_overlay, 0); + ASSERT_EQ(close(fd_context), 0); + ASSERT_EQ(close(fd_overlay), 0); +} + TEST_HARNESS_MAIN