open: introduce openat2(2) syscall
Subsystems (23)
v15 cover open: introduce openat2(2) syscall
This patchset is being developed here:
<https://github.com/cyphar/linux/tree/openat2/master>
Patch changelog:
v15:
* Fix code style for LOOKUP_IN_ROOT handling in path_init(). [Linus Torvalds]
* Split out patches for each individual LOOKUP flag.
* Reword commit messages to give more background information about the series, as well as mention the semantics of each flag in more detail.
v14: <https://lore.kernel.org/lkml/[email protected]/>
<https://lore.kernel.org/lkml/[email protected]> v13: <https://lore.kernel.org/lkml/[email protected]/> v12: <https://lore.kernel.org/lkml/[email protected]/> v11: <https://lore.kernel.org/lkml/[email protected]/> <https://lore.kernel.org/lkml/[email protected]/>
v10: <https://lore.kernel.org/lkml/[email protected]/>
v09: <https://lore.kernel.org/lkml/[email protected]/>
v08: <https://lore.kernel.org/lkml/[email protected]/>
v07: <https://lore.kernel.org/lkml/[email protected]/>
v06: <https://lore.kernel.org/lkml/[email protected]/>
v05: <https://lore.kernel.org/lkml/[email protected]/>
v04: <https://lore.kernel.org/lkml/[email protected]/>
v03: <https://lore.kernel.org/lkml/[email protected]/>
v02: <https://lore.kernel.org/lkml/[email protected]/>
v01: <https://lore.kernel.org/lkml/[email protected]/>
For a very long time, extending openat(2) with new features has been incredibly frustrating. This stems from the fact that openat(2) is possibly the most famous counter-example to the mantra "don't silently accept garbage from userspace" -- it doesn't check whether unknown flags are present[1].
This means that (generally) the addition of new flags to openat(2) has been fraught with backwards-compatibility issues (O_TMPFILE has to be defined as __O_TMPFILE|O_DIRECTORY|[O_RDWR or O_WRONLY] to ensure old kernels gave errors, since it's insecure to silently ignore the flag[2]). All new security-related flags therefore have a tough road to being added to openat(2).
Furthermore, the need for some sort of control over VFS's path resolution (to avoid malicious paths resulting in inadvertent breakouts) has been a very long-standing desire of many userspace applications. This patchset is a revival of Al Viro's old AT_NO_JUMPS[3] patchset (which was a variant of David Drysdale's O_BENEATH patchset[4] which was a spin-off of the Capsicum project[5]) with a few additions and changes made based on the previous discussion within [6] as well as others I felt were useful.
In line with the conclusions of the original discussion of AT_NO_JUMPS, the flag has been split up into separate flags. However, instead of being an openat(2) flag it is provided through a new syscall openat2(2) which provides several other improvements to the openat(2) interface (see the patch description for more details). The following new LOOKUP_* flags are added:
* LOOKUP_NO_XDEV blocks all mountpoint crossings (upwards, downwards, or through absolute links). Absolute pathnames alone in openat(2) do not trigger this. Magic-link traversal which implies a vfsmount jump is also blocked (though magic-link jumps on the same vfsmount are permitted).
* LOOKUP_NO_MAGICLINKS blocks resolution through /proc/$pid/fd-style links. This is done by blocking the usage of nd_jump_link() during resolution in a filesystem. The term "magic-links" is used to match with the only reference to these links in Documentation/, but I'm happy to change the name.
It should be noted that this is different to the scope of ~LOOKUP_FOLLOW in that it applies to all path components. However, you can do openat2(NO_FOLLOW|NO_MAGICLINKS) on a magic-link and it will *not* fail (assuming that no parent component was a magic-link), and you will have an fd for the magic-link.
In order to correctly detect magic-links, the introduction of a new LOOKUP_MAGICLINK_JUMPED state flag was required.
* LOOKUP_BENEATH disallows escapes to outside the starting dirfd's tree, using techniques such as ".." or absolute links. Absolute paths in openat(2) are also disallowed. Conceptually this flag is to ensure you "stay below" a certain point in the filesystem tree -- but this requires some additional to protect against various races that would allow escape using "..".
Currently LOOKUP_BENEATH implies LOOKUP_NO_MAGICLINKS, because it can trivially beam you around the filesystem (breaking the protection). In future, there might be similar safety checks done as in LOOKUP_IN_ROOT, but that requires more discussion.
In addition, two new flags are added that expand on the above ideas:
* LOOKUP_NO_SYMLINKS does what it says on the tin. No symlink resolution is allowed at all, including magic-links. Just as with LOOKUP_NO_MAGICLINKS this can still be used with NOFOLLOW to open an fd for the symlink as long as no parent path had a symlink component.
* LOOKUP_IN_ROOT is an extension of LOOKUP_BENEATH that, rather than blocking attempts to move past the root, forces all such movements to be scoped to the starting point. This provides chroot(2)-like protection but without the cost of a chroot(2) for each filesystem operation, as well as being safe against race attacks that chroot(2) is not.
If a race is detected (as with LOOKUP_BENEATH) then an error is generated, and similar to LOOKUP_BENEATH it is not permitted to cross magic-links with LOOKUP_IN_ROOT.
The primary need for this is from container runtimes, which currently need to do symlink scoping in userspace[7] when opening paths in a potentially malicious container. There is a long list of CVEs that could have bene mitigated by having RESOLVE_THIS_ROOT (such as CVE-2017-1002101, CVE-2017-1002102, CVE-2018-15664, and CVE-2019-5736, just to name a few).
In order to make all of the above more usable, I'm working on libpathrs[8] which is a C-friendly library for safe path resolution. It features a userspace-emulated backend if the kernel doesn't support openat2(2). Hopefully we can get userspace to switch to using it, and thus get openat2(2) support for free once it's ready.
Future work would include implementing things like RESOLVE_NO_AUTOMOUNT and possibly a RESOLVE_NO_REMOTE (to allow programs to be sure they don't hit DoSes though stale NFS handles).
[1]: https://lwn.net/Articles/588444/
[2]: https://lore.kernel.org/lkml/CA+55aFyyxJL1LyXZeBsf2ypriraj5ut1XkNDsunRBqgVjZU_6Q@mail.gmail.com
[3]: https://lore.kernel.org/lkml/[email protected]
[4]: https://lore.kernel.org/lkml/[email protected]
[5]: https://lore.kernel.org/lkml/[email protected]
[6]: https://lwn.net/Articles/723057/
[7]: https://github.com/cyphar/filepath-securejoin
[8]: https://github.com/openSUSE/libpathrs
The current draft of the openat2(2) man-page is included below.
--8<---------------------------------------------------------------------------
OPENAT2(2) Linux Programmer's Manual OPENAT2(2)
NAME
openat2 - open and possibly create a file (extended)
SYNOPSIS
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
int openat2(int dirfd, const char *pathname, struct open_how *how, size_t size);
Note: There is no glibc wrapper for this system call; see NOTES.DESCRIPTION
The openat2() system call opens the file specified by pathname. If the specified file does not exist, it may optionally (if O_CREAT is specified in how.flags) be created by openat2().
As with openat(2), if pathname is relative, then it is interpreted relative to the direc- tory referred to by the file descriptor dirfd (or the current working directory of the calling process, if dirfd is the special value AT_FDCWD.) If pathname is absolute, then dirfd is ignored (unless how.resolve contains RESOLVE_IN_ROOT, in which case pathname is resolved relative to dirfd.)
The openat2() system call is an extension of openat(2) and provides a superset of its functionality. Rather than taking a single flag argument, an extensible structure (how) is passed instead to allow for future extensions. size must be set to sizeof(struct open_how), to facilitate future extensions (see the "Extensibility" section of the NOTES for more detail on how extensions are handled.)
The open_how structure
The following structure indicates how pathname should be opened, and acts as a superset of the flag and mode arguments to openat(2).
struct open_how {
__aligned_u64 flags; /* O_* flags. */
__u16 mode; /* Mode for O_{CREAT,TMPFILE}. */
__u16 __padding[3]; /* Must be zeroed. */
__aligned_u64 resolve; /* RESOLVE_* flags. */
};
Any future extensions to openat2() will be implemented as new fields appended to the above structure (or through reuse of pre-existing padding space), with the zero value of the new fields acting as though the extension were not present.
The meaning of each field is as follows:
flags
The file creation and status flags to use for this operation. All of the
O_* flags defined for openat(2) are valid openat2() flag values.
Unlike openat(2), it is an error to provide openat2() unknown or conflicting flags in flags.
mode
File mode for the new file, with identical semantics to the mode argument to
openat(2). However, unlike openat(2), it is an error to provide openat2()
with a mode which contains bits other than 0777.
It is an error to provide openat2() a non-zero mode if flags does not con- tain O_CREAT or O_TMPFILE.
resolve
Change how the components of pathname will be resolved (see path_resolu- tion(7) for background information.) The primary use case for these flags is to allow trusted programs to restrict how untrusted paths (or paths in- side untrusted directories) are resolved. The full list of resolve flags is given below.
RESOLVE_NO_XDEV
Disallow traversal of mount points during path resolution (including all bind mounts).
Users of this flag are encouraged to make its use configurable (un- less it is used for a specific security purpose), as bind mounts are very widely used by end-users. Setting this flag indiscrimnately for all uses of openat2() may result in spurious errors on previously- functional systems.
RESOLVE_NO_SYMLINKS
Disallow resolution of symbolic links during path resolution. This
option implies RESOLVE_NO_MAGICLINKS.
If the trailing component is a symbolic link, and flags contains both O_PATH and O_NOFOLLOW, then an O_PATH file descriptor referencing the symbolic link will be returned.
Users of this flag are encouraged to make its use configurable (un- less it is used for a specific security purpose), as symbolic links are very widely used by end-users. Setting this flag indiscrimnately for all uses of openat2() may result in spurious errors on previ- ously-functional systems.
RESOLVE_NO_MAGICLINKS
Disallow all magic link resolution during path resolution.
If the trailing component is a magic link, and flags contains both O_PATH and O_NOFOLLOW, then an O_PATH file descriptor referencing the magic link will be returned.
Magic-links are symbolic link-like objects that are most notably
found in proc(5) (examples include /proc/[pid]/exe and
/proc/[pid]/fd/*.) Due to the potential danger of unknowingly open-
ing these magic links, it may be preferable for users to disable their resolution entirely (see symboliclink(7) for more details.)
RESOLVE_BENEATH
Do not permit the path resolution to succeed if any component of the resolution is not a descendant of the directory indicated by dirfd. This results in absolute symbolic links (and absolute values of path- name) to be rejected.
Currently, this flag also disables magic link resolution. However,
this may change in the future. The caller should explicitly specify RESOLVE_NO_MAGICLINKS to ensure that magic links are not resolved.
RESOLVE_IN_ROOT
Treat dirfd as the root directory while resolving pathname (as though the user called chroot(2) with dirfd as the argument.) Absolute sym-
bolic links and ".." path components will be scoped to dirfd. If
pathname is an absolute path, it is also treated relative to dirfd.
However, unlike chroot(2) (which changes the filesystem root perma- nently for a process), RESOLVE_IN_ROOT allows a program to effi- ciently restrict path resolution for only certain operations. It also has several hardening features (such detecting escape attempts during .. resolution) which chroot(2) does not.
Currently, this flag also disables magic link resolution. However, this may change in the future. The caller should explicitly specify RESOLVE_NO_MAGICLINKS to ensure that magic links are not resolved.
It is an error to provide openat2() unknown flags in resolve.
RETURN VALUE
On success, a new file descriptor is returned. On error, -1 is returned, and errno is set appropriately.
ERRORS
The set of errors returned by openat2() includes all of the errors returned by openat(2), as well as the following additional errors:
EINVAL An unknown flag or invalid value was specified in how.
EINVAL mode is non-zero, but flags does not contain O_CREAT or O_TMPFILE.
EINVAL size was smaller than any known version of struct open_how.
E2BIG An extension was specified in how, which the current kernel does not support (see
the "Extensibility" section of the NOTES for more detail on how extensions are han- dled.)
EAGAIN resolve contains either RESOLVE_IN_ROOT or RESOLVE_BENEATH, and the kernel could
not ensure that a ".." component didn't escape (due to a race condition or poten- tial attack.) Callers may choose to retry the openat2() call.
EXDEV resolve contains either RESOLVE_IN_ROOT or RESOLVE_BENEATH, and an escape from the
root during path resolution was detected.
EXDEV resolve contains RESOLVE_NO_XDEV, and a path component attempted to cross a mount
point.
ELOOP resolve contains RESOLVE_NO_SYMLINKS, and one of the path components was a symbolic
link (or magic link).
ELOOP resolve contains RESOLVE_NO_MAGICLINKS, and one of the path components was a magic
link.
VERSIONS
openat2() was added to Linux in kernel 5.FOO.
CONFORMING TO
This system call is Linux-specific.
The semantics of RESOLVE_BENEATH were modelled after FreeBSD's O_BENEATH.
NOTES
Glibc does not provide a wrapper for this system call; call it using systemcall(2).
Extensibility
In order to allow for struct open_how to be extended in future kernel revisions, openat2()
requires userspace to specify the size of struct open_how structure they are passing. By
providing this information, it is possible for openat2() to provide both forwards- and backwards-compatibility — with size acting as an implicit version number (because new ex- tension fields will always be appended, the size will always increase.) This extensibil-
ity design is very similar to other system calls such as perf_setattr(2),
perf_event_open(2), and clone(3).
If we let usize be the size of the structure according to userspace and ksize be the size of the structure which the kernel supports, then there are only three cases to consider:
* If ksize equals usize, then there is no version mismatch and how can be used verbatim.
* If ksize is larger than usize, then there are some extensions the kernel sup- ports which the userspace program is unaware of. Because all extensions must have their zero values be a no-op, the kernel treats all of the extension fields not set by userspace to have zero values. This provides backwards-compatibil- ity.
* If ksize is smaller than usize, then there are some extensions which the userspace program is aware of but the kernel does not support. Because all ex- tensions must have their zero values be a no-op, the kernel can safely ignore the unsupported extension fields if they are all-zero. If any unsupported ex- tension fields are non-zero, then -1 is returned and errno is set to E2BIG. This provides forwards-compatibility.
Therefore, most userspace programs will not need to have any special handling of exten-
sions. However, if a userspace program wishes to determine what extensions the running
kernel supports, they may conduct a binary search on size (to find the largest value which doesn't produce an error of E2BIG.)
SEE ALSO
openat(2), path_resolution(7), symlink(7)
Linux 2019-11-05 OPENAT2(2)
--8<---------------------------------------------------------------------------
Aleksa Sarai (9):
namei: LOOKUP_NO_SYMLINKS: block symlink resolution
namei: LOOKUP_NO_MAGICLINKS: block magic-link resolution
namei: LOOKUP_NO_XDEV: block mountpoint crossing
namei: LOOKUP_BENEATH: O_BENEATH-like scoped resolution
namei: LOOKUP_IN_ROOT: chroot-like scoped resolution
namei: LOOKUP_{IN_ROOT,BENEATH}: permit limited ".." resolution
open: introduce openat2(2) syscall
selftests: add openat2(2) selftests
Documentation: path-lookup: mention LOOKUP_MAGICLINK_JUMPED
CREDITS | 4 +- Documentation/filesystems/path-lookup.rst | 18 +- arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 + arch/ia64/kernel/syscalls/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + fs/namei.c | 176 +++++- fs/open.c | 149 +++-- include/linux/fcntl.h | 12 +- include/linux/namei.h | 11 + include/linux/syscalls.h | 3 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/fcntl.h | 41 ++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/openat2/.gitignore | 1 + tools/testing/selftests/openat2/Makefile | 8 + tools/testing/selftests/openat2/helpers.c | 109 ++++ tools/testing/selftests/openat2/helpers.h | 107 ++++ .../testing/selftests/openat2/openat2_test.c | 316 +++++++++++ .../selftests/openat2/rename_attack_test.c | 160 ++++++ .../testing/selftests/openat2/resolve_test.c | 523 ++++++++++++++++++ 35 files changed, 1591 insertions(+), 73 deletions(-) create mode 100644 tools/testing/selftests/openat2/.gitignore create mode 100644 tools/testing/selftests/openat2/Makefile create mode 100644 tools/testing/selftests/openat2/helpers.c create mode 100644 tools/testing/selftests/openat2/helpers.h create mode 100644 tools/testing/selftests/openat2/openat2_test.c create mode 100644 tools/testing/selftests/openat2/rename_attack_test.c create mode 100644 tools/testing/selftests/openat2/resolve_test.c
base-commit: a99d8080aaf358d5d23581244e5da23b35e340b9
Signature · 1 line
2.23.0
PATCH v15 1/9 namei: LOOKUP_NO_SYMLINKS: block symlink resolution
/* Background. */
Userspace cannot easily resolve a path without resolving symlinks, and would have to manually resolve each path component with O_PATH and O_NOFOLLOW. This is clearly inefficient, and can be fairly easy to screw up (resulting in possible security bugs). Linus has mentioned that Git has a particular need for this kind of flag[1]. It also resolves a fairly long-standing perceived deficiency in O_NOFOLLOw -- that it only blocks the opening of trailing symlinks.
This is part of a refresh of Al's AT_NO_JUMPS patchset[2] (which was a variation on David Drysdale's O_BENEATH patchset[3], which in turn was based on the Capsicum project[4]).
/* Userspace API. */LOOKUP_NO_SYMLINKS will be exposed to userspace through openat2(2).
/* Semantics. */
Unlike most other LOOKUP flags (most notably LOOKUP_FOLLOW), LOOKUP_NO_SYMLINKS applies to all components of the path.
With LOOKUP_NO_SYMLINKS, any symlink path component encountered during path resolution will yield -ELOOP. If the trailing component is a symlink (and no other components were symlinks), then O_PATH|O_NOFOLLOW will not error out and will instead provide a handle to the trailing symlink -- without resolving it.
/* Testing. */LOOKUP_NO_SYMLINKS is tested as part of the openat2(2) selftests.
[1]: https://lore.kernel.org/lkml/CA+55aFyOKM7DW7+0sdDFKdZFXgptb5r1id9=Wvhd8AgSP7qjwQ@mail.gmail.com/
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/lkml/[email protected]/
[4]: https://lore.kernel.org/lkml/[email protected]/
--- fs/namei.c | 3 +++ include/linux/namei.h | 3 +++ 2 files changed, 6 insertions(+)
fs/namei.c +3 -0
@@ -1045,6 +1045,9 @@ const char *get_link(struct nameidata *nd)int error;const char *res; +if (unlikely (nd->flags &LOOKUP_NO_SYMLINKS )) +return ERR_PTR (-ELOOP ); +if (!(nd->flags &LOOKUP_RCU )) {touch_atime (&last->link);cond_resched ();
include/linux/namei.h +3 -0
@@ -39,6 +39,9 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};#define LOOKUP_ROOT 0x2000#define LOOKUP_ROOT_GRABBED 0x0008 +/* Scoping flags for lookup. */ +#define LOOKUP_NO_SYMLINKS 0x020000/* No symlink crossing. */ +extern int path_pts (struct path *path);extern int user_path_at_empty (int ,const char __user *,unsigned ,struct path *,int *empty);
Signature · 1 line
2.23.0
PATCH v15 2/9 namei: LOOKUP_NO_MAGICLINKS: block magic-link resolution
In reply to Aleksa Sarai/* Background. */
There has always been a special class of symlink-like objects in procfs (and a few other pseudo-filesystems) which allow for non-lexical resolution of paths using nd_jump_link(). These "magic-links" do not follow traditional mount namespace boundaries, and have been used consistently in container escape attacks because they can be used to trick unsuspecting privileged processes into resolving unexpected paths.
It is also non-trivial for userspace to unambiguously avoid resolving magic-links, because they do not have a reliable indication that they are a magic-link (in order to verify them you'd have to manually open the path given by readlink(2) and then verify that the two file descriptors reference the same underlying file, which is plagued with possible race conditions or supplementary attack scenarios).
It would therefore be very helpful for userspace to be able to avoid these symlinks easily, thus hopefully removing a tool from attackers' toolboxes.
This is part of a refresh of Al's AT_NO_JUMPS patchset[1] (which was a variation on David Drysdale's O_BENEATH patchset[2], which in turn was based on the Capsicum project[3]).
/* Userspace API. */LOOKUP_NO_MAGICLINKS will be exposed to userspace through openat2(2).
/* Semantics. */
Unlike most other LOOKUP flags (most notably LOOKUP_FOLLOW), LOOKUP_NO_MAGICLINKS applies to all components of the path.
With LOOKUP_NO_MAGICLINKS, any magic-link path component encountered during path resolution will yield -ELOOP. The handling of ~LOOKUP_FOLLOW for a trailing magic-link is identical to LOOKUP_NO_SYMLINKS.
LOOKUP_NO_SYMLINKS implies LOOKUP_NO_MAGICLINKS.
/* Testing. */LOOKUP_NO_MAGICLINKS is tested as part of the openat2(2) selftests.
[1]: https://lore.kernel.org/lkml/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/lkml/[email protected]/
--- fs/namei.c | 7 ++++++- include/linux/namei.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-)
fs/namei.c +6 -1
@@ -866,7 +866,7 @@ void nd_jump_link(struct path *path) nd->path = *path; nd->inode = nd->path.dentry->d_inode; - nd->flags |=LOOKUP_JUMPED ; + nd->flags |=LOOKUP_JUMPED |LOOKUP_MAGICLINK_JUMPED ; }static inline void put_link (struct nameidata *nd)
@@ -1063,6 +1063,7 @@ const char *get_link(struct nameidata *nd)return ERR_PTR (error); nd->last_type =LAST_BIND ; + nd->flags &= ~LOOKUP_MAGICLINK_JUMPED ; res =READ_ONCE (inode->i_link);if (!res) { const char * (*get)(struct dentry *, struct inode *,
@@ -1078,6 +1079,10 @@ const char *get_link(struct nameidata *nd) }else { res =get (dentry, inode, &last->done); } +if (nd->flags &LOOKUP_MAGICLINK_JUMPED ) { +if (unlikely (nd->flags &LOOKUP_NO_MAGICLINKS )) +return ERR_PTR (-ELOOP ); + }if (IS_ERR_OR_NULL (res))return res; }
include/linux/namei.h +2 -0
@@ -38,9 +38,11 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};#define LOOKUP_JUMPED 0x1000#define LOOKUP_ROOT 0x2000#define LOOKUP_ROOT_GRABBED 0x0008 +#define LOOKUP_MAGICLINK_JUMPED 0x10000/* Scoping flags for lookup. */ #define LOOKUP_NO_SYMLINKS 0x020000/* No symlink crossing. */ +#define LOOKUP_NO_MAGICLINKS 0x040000/* No /proc/$pid/fd/ "symlink" crossing. */ extern int path_pts (struct path *path);
Signature · 1 line
2.23.0
Al Viro
maintainerRe: [PATCH v15 2/9] namei: LOOKUP_NO_MAGICLINKS: block magic-link resolution
fs/namei.c const char *get_link(struct nameidata *nd) · line 1085
Quoted 8 lines · Aleksa Sarai
fs/namei.c +4
-0@@ -1078,6 +1079,10 @@ const char *get_link(struct nameidata *nd) }else { res =get (dentry, inode, &last->done); } +if (nd->flags &LOOKUP_MAGICLINK_JUMPED ) { +if (unlikely (nd->flags &LOOKUP_NO_MAGICLINKS )) +return ERR_PTR (-ELOOP ); + }
Minor nit - the first check probably wants unlikely() more than the second one; it's probably noise anyway, but most of the symlinks traversed are not going to be procfs ones, so you get test + branch taken most of the time.
OTOH, that just might compile into
fetch nd->flags
and with LOOKUP_MAGICLINK_JUMPED | LOOKUP_NO_MAGICLINKS compare with the same constant
unlikely branch when equal
Anyway, that's no more than a minor nit and can be dealt with later (if at all)
PATCH v15 3/9 namei: LOOKUP_NO_XDEV: block mountpoint crossing
In reply to Aleksa Sarai/* Background. */
The need to contain path operations within a mountpoint has been a long-standing usecase that userspace has historically implemented manually with liberal usage of stat(). find, rsync, tar and many other programs implement these semantics -- but it'd be much simpler to have a fool-proof way of refusing to open a path if it crosses a mountpoint.
This is part of a refresh of Al's AT_NO_JUMPS patchset[1] (which was a variation on David Drysdale's O_BENEATH patchset[2], which in turn was based on the Capsicum project[3]).
/* Userspace API. */LOOKUP_NO_XDEV will be exposed to userspace through openat2(2).
/* Semantics. */
Unlike most other LOOKUP flags (most notably LOOKUP_FOLLOW), LOOKUP_NO_XDEV applies to all components of the path.
With LOOKUP_NO_XDEV, any path component which crosses a mount-point during path resolution (including "..") will yield an -EXDEV. Absolute paths, absolute symlinks, and magic-links will only yield an -EXDEV if the jump involved changing mount-points.
/* Testing. */LOOKUP_NO_XDEV is tested as part of the openat2(2) selftests.
[1]: https://lore.kernel.org/lkml/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/lkml/[email protected]/
--- fs/namei.c | 34 ++++++++++++++++++++++++++++++---- include/linux/namei.h | 1 + 2 files changed, 31 insertions(+), 4 deletions(-)
fs/namei.c +30 -4
@@ -504,6 +504,9 @@ struct nameidata {struct filename *name;struct nameidata *saved;struct inode *link_inode; +struct { +bool same_mnt; + } last_magiclink;unsigned root_seq;int dfd; } __randomize_layout;
@@ -837,6 +840,11 @@ static inline void path_to_nameidata(const struct path *path,static int nd_jump_root (struct nameidata *nd) { +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) { +/* Absolute path arguments to path_init() are allowed. */ +if (nd->path.mnt !=NULL && nd->path.mnt != nd->root.mnt) +return -EXDEV ; + }if (nd->flags &LOOKUP_RCU ) {struct dentry *d; nd->path = nd->root;
@@ -862,6 +870,8 @@ static int nd_jump_root(struct nameidata *nd)void nd_jump_link (struct path *path) {struct nameidata *nd = current->nameidata; + + nd->last_magiclink.same_mnt = (nd->path.mnt == path->mnt);path_put (&nd->path); nd->path = *path;
@@ -1082,6 +1092,10 @@ const char *get_link(struct nameidata *nd)if (nd->flags &LOOKUP_MAGICLINK_JUMPED ) {if (unlikely (nd->flags &LOOKUP_NO_MAGICLINKS ))return ERR_PTR (-ELOOP ); +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) { +if (!nd->last_magiclink.same_mnt) +return ERR_PTR (-EXDEV ); + } }if (IS_ERR_OR_NULL (res))return res;
@@ -1271,12 +1285,16 @@ static int follow_managed(struct path *path, struct nameidata *nd)break ; } -if (need_mntput && path->mnt == mnt) -mntput (path->mnt); +if (need_mntput) { +if (path->mnt == mnt) +mntput (path->mnt); +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) + ret = -EXDEV ; +else + nd->flags |=LOOKUP_JUMPED ; + }if (ret == -EISDIR || !ret) ret =1 ; -if (need_mntput) - nd->flags |=LOOKUP_JUMPED ;if (unlikely (ret <0 ))path_put_conditional (path, nd);return ret;
@@ -1333,6 +1351,8 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path, mounted =__lookup_mnt (path->mnt, path->dentry);if (!mounted)break ; +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) +return false; path->mnt = &mounted->mnt; path->dentry = mounted->mnt.mnt_root; nd->flags |=LOOKUP_JUMPED ;
@@ -1379,6 +1399,8 @@ static int follow_dotdot_rcu(struct nameidata *nd)return -ECHILD ;if (&mparent->mnt == nd->path.mnt)break ; +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) +return -EXDEV ;/* we know that mountpoint was pinned */ nd->path.dentry = mountpoint; nd->path.mnt = &mparent->mnt;
@@ -1393,6 +1415,8 @@ static int follow_dotdot_rcu(struct nameidata *nd)return -ECHILD ;if (!mounted)break ; +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) +return -EXDEV ; nd->path.mnt = &mounted->mnt; nd->path.dentry = mounted->mnt.mnt_root; inode = nd->path.dentry->d_inode;
@@ -1491,6 +1515,8 @@ static int follow_dotdot(struct nameidata *nd) }if (!follow_up (&nd->path))break ; +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) +return -EXDEV ; }follow_mount (&nd->path); nd->inode = nd->path.dentry->d_inode;
include/linux/namei.h +1 -0
@@ -43,6 +43,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};/* Scoping flags for lookup. */ #define LOOKUP_NO_SYMLINKS 0x020000/* No symlink crossing. */ #define LOOKUP_NO_MAGICLINKS 0x040000/* No /proc/$pid/fd/ "symlink" crossing. */ +#define LOOKUP_NO_XDEV 0x080000/* No mountpoint crossing. */ extern int path_pts (struct path *path);
Signature · 1 line
2.23.0
Al Viro
maintainerRe: [PATCH v15 3/9] namei: LOOKUP_NO_XDEV: block mountpoint crossing
Quoted 10 lines · Aleksa Sarai
(quoted diff) +2
-0@@ -862,6 +870,8 @@ static int nd_jump_root(struct nameidata *nd) void nd_jump_link(struct path *path) { struct nameidata *nd = current->nameidata; + + nd->last_magiclink.same_mnt = (nd->path.mnt == path->mnt); path_put(&nd->path); nd->path = *path;
Review const char *get_link(struct nameidata *nd) · line 1099
Quoted 8 lines
(quoted diff) +4
-0@@ -1082,6 +1092,10 @@ const char *get_link(struct nameidata *nd) if (nd->flags & LOOKUP_MAGICLINK_JUMPED) { if (unlikely(nd->flags & LOOKUP_NO_MAGICLINKS)) return ERR_PTR(-ELOOP); + if (unlikely(nd->flags & LOOKUP_NO_XDEV)) { + if (!nd->last_magiclink.same_mnt) + return ERR_PTR(-EXDEV); + } }
Ugh... Wouldn't it be better to take that logics (some equivalent thereof) into nd_jump_link()? Or just have nd_jump_link() return an error...
I mean, look at the callers of nd_jump_link(). static const char *policy_get_link(struct dentry *dentry,
struct inode *inode, struct delayed_call *done)
{
struct aa_ns *ns;
struct path path;
if (!dentry)
return ERR_PTR(-ECHILD);
ns = aa_get_current_ns();
path.mnt = mntget(aafs_mnt);
path.dentry = dget(ns_dir(ns));
nd_jump_link(&path);
aa_put_ns(ns);
return NULL;
}- very close to the end of ->get_link() instance.
static const char *proc_pid_get_link(struct dentry *dentry,
struct inode *inode, struct delayed_call *done)
{
struct path path;
int error = -EACCES;
if (!dentry)
return ERR_PTR(-ECHILD);
/* Are we allowed to snoop on the tasks file descriptors? */
if (!proc_fd_access_allowed(inode))
goto out;
error = PROC_I(inode)->op.proc_get_link(dentry, &path);
if (error)
goto out;
nd_jump_link(&path);
return NULL;
out:
return ERR_PTR(error);
}Ditto.
static const char *proc_ns_get_link(struct dentry *dentry,
struct inode *inode, struct delayed_call *done)
{
const struct proc_ns_operations *ns_ops = PROC_I(inode)->ns_ops;
struct task_struct *task;
struct path ns_path;
void *error = ERR_PTR(-EACCES);
if (!dentry)
return ERR_PTR(-ECHILD);
task = get_proc_task(inode);
if (!task)
return error;
if (ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS)) {
error = ns_get_path(&ns_path, task, ns_ops);
if (!error)
nd_jump_link(&ns_path);
}
put_task_struct(task);
return error;
}The same. And that's it - there's no more of them. So how about this in the beginning of the series, then having your magiclink error handling done in nd_jump_link()?
fs/namei.c +2 -1
@@ -859,7 +859,7 @@ static int nd_jump_root(struct nameidata *nd)* Helper to directly jump to a known parsed path from ->get_link, * caller must have taken a reference to path beforehand. */ -void nd_jump_link (struct path *path) +const char *nd_jump_link (struct path *path) {struct nameidata *nd = current->nameidata;path_put (&nd->path);
@@ -867,6 +867,7 @@ void nd_jump_link(struct path *path) nd->path = *path; nd->inode = nd->path.dentry->d_inode; nd->flags |=LOOKUP_JUMPED ; +return NULL ; }static inline void put_link (struct nameidata *nd)
fs/proc/base.c +1 -2
@@ -1626,8 +1626,7 @@ static const char *proc_pid_get_link(struct dentry *dentry,if (error) goto out; -nd_jump_link (&path); -return NULL ; +return nd_jump_link (&path); out:return ERR_PTR (error); }
fs/proc/namespaces.c +1 -1
@@ -54,7 +54,7 @@ static const char *proc_ns_get_link(struct dentry *dentry,if (ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) { error =ns_get_path (&ns_path, task, ns_ops);if (!error) -nd_jump_link (&ns_path); + error =nd_jump_link (&ns_path); }put_task_struct (task);return error;
include/linux/namei.h +1 -1
@@ -68,7 +68,7 @@ extern int follow_up(struct path *);extern struct dentry *lock_rename (struct dentry *,struct dentry *);extern void unlock_rename (struct dentry *,struct dentry *); -extern void nd_jump_link (struct path *path); +extern const char *nd_jump_link (struct path *path);static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) {
security/apparmor/apparmorfs.c +10 -12
@@ -2453,18 +2453,16 @@ static const char *policy_get_link(struct dentry *dentry,struct inode *inode, struct delayed_call *done) { - struct aa_ns *ns; -struct path path; - -if (!dentry) -return ERR_PTR (-ECHILD ); - ns =aa_get_current_ns (); - path.mnt =mntget (aafs_mnt); - path.dentry =dget (ns_dir (ns)); -nd_jump_link (&path); -aa_put_ns (ns); - -return NULL ; + const char *err = ERR_PTR(-ECHILD); + +if (dentry) { +struct aa_ns *ns =aa_get_current_ns (); +struct path path = {.mnt =mntget (aafs_mnt), + .dentry =ns_dir (ns)}; + err =nd_jump_link (&path); +aa_put_ns (ns); + } +return err; } static int policy_readlink(struct dentry *dentry, char __user *buffer,
Re: [PATCH v15 3/9] namei: LOOKUP_NO_XDEV: block mountpoint crossing
Quoted 10 lines · Al Viro
Quoted 8 lines · Aleksa Sarai
(quoted diff) +2
-0@@ -862,6 +870,8 @@ static int nd_jump_root(struct nameidata *nd) void nd_jump_link(struct path *path) { struct nameidata *nd = current->nameidata; + + nd->last_magiclink.same_mnt = (nd->path.mnt == path->mnt); path_put(&nd->path);
Quoted 13 lines
fs/namei.c const char *get_link(struct nameidata *nd) · line 1099
Quoted 10 lines
fs/namei.c +4
-0nd->path = *path;@@ -1082,6 +1092,10 @@ const char *get_link(struct nameidata *nd)if (nd->flags &LOOKUP_MAGICLINK_JUMPED ) {if (unlikely (nd->flags &LOOKUP_NO_MAGICLINKS ))return ERR_PTR (-ELOOP ); +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) { +if (!nd->last_magiclink.same_mnt) +return ERR_PTR (-EXDEV ); + } }Ugh... Wouldn't it be better to take that logics (some equivalent thereof) into
nd_jump_link()? Or just havend_jump_link()return an error...
This could be done, but the reason for stashing it away in last_magiclink is because of the future magic-link re-opening patches which can't be implemented like that without putting the open_flags inside nameidata (which was decided to be too ugly a while ago).
My point being that I could implement it this way for this series, but I'd have to implement something like last_magiclink when I end up re-posting the magic-link stuff in a few weeks.
Looking at all the nd_jump_link() users, the other option is to just disallow magic-link crossings entirely for LOOKUP_NO_XDEV. The only thing allowing them permits is to resolve file descriptors that are pointing to the same procfs mount -- and it's unclear to me how useful that really is (apparmorfs and nsfs will always give -EXDEV because aafs_mnt and nsfs_mnt are internal kernel vfsmounts).
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
Al Viro
maintainerRe: [PATCH v15 3/9] namei: LOOKUP_NO_XDEV: block mountpoint crossing
Quoted 34 lines · Aleksa Sarai
Quoted 10 lines · Al Viro
Quoted 8 lines · Aleksa Sarai
(quoted diff) +2
-0@@ -862,6 +870,8 @@ static int nd_jump_root(struct nameidata *nd) void nd_jump_link(struct path *path) { struct nameidata *nd = current->nameidata; + + nd->last_magiclink.same_mnt = (nd->path.mnt == path->mnt); path_put(&nd->path);Quoted 13 lines
fs/namei.c const char *get_link(struct nameidata *nd) · line 1099
Quoted 10 lines
fs/namei.c +4
-0nd->path = *path;@@ -1082,6 +1092,10 @@ const char *get_link(struct nameidata *nd)if (nd->flags &LOOKUP_MAGICLINK_JUMPED ) {if (unlikely (nd->flags &LOOKUP_NO_MAGICLINKS ))return ERR_PTR (-ELOOP ); +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) { +if (!nd->last_magiclink.same_mnt) +return ERR_PTR (-EXDEV ); + } }Ugh... Wouldn't it be better to take that logics (some equivalent thereof) into
nd_jump_link()? Or just havend_jump_link()return an error...This could be done, but the reason for stashing it away in
last_magiclinkis because of the future magic-link re-opening patches which can't be implemented like that without putting theopen_flagsinside nameidata (which was decided to be too ugly a while ago).My point being that I could implement it this way for this series, but I'd have to implement something like
last_magiclinkwhen I end up re-posting the magic-link stuff in a few weeks.
Quoted 6 lines
Looking at all the
nd_jump_link()users, the other option is to just disallow magic-link crossings entirely forLOOKUP_NO_XDEV. The only thing allowing them permits is to resolve file descriptors that are pointing to the same procfs mount -- and it's unclear to me how useful that really is (apparmorfs and nsfs will always give-EXDEVbecauseaafs_mntandnsfs_mntare internal kernel vfsmounts).
I would rather keep the entire if (nd->flags & LOOKUP_MAGICLINK_JUMPED) out of the get_link(). If you want to generate some error if nd_jump_link() has been called, just do it right there. The fewer pieces of state need to be carried around, the better...
And as for opening them... Why would you need full open_flags in there? Details, please...
Re: [PATCH v15 3/9] namei: LOOKUP_NO_XDEV: block mountpoint crossing
Quoted 42 lines · Al Viro
Quoted 34 lines · Aleksa Sarai
Quoted 10 lines · Al Viro
Quoted 8 lines · Aleksa Sarai
(quoted diff) +2
-0@@ -862,6 +870,8 @@ static int nd_jump_root(struct nameidata *nd) void nd_jump_link(struct path *path) { struct nameidata *nd = current->nameidata; + + nd->last_magiclink.same_mnt = (nd->path.mnt == path->mnt); path_put(&nd->path);Quoted 13 lines
fs/namei.c const char *get_link(struct nameidata *nd) · line 1099
Quoted 10 lines
fs/namei.c +4
-0nd->path = *path;@@ -1082,6 +1092,10 @@ const char *get_link(struct nameidata *nd)if (nd->flags &LOOKUP_MAGICLINK_JUMPED ) {if (unlikely (nd->flags &LOOKUP_NO_MAGICLINKS ))return ERR_PTR (-ELOOP ); +if (unlikely (nd->flags &LOOKUP_NO_XDEV )) { +if (!nd->last_magiclink.same_mnt) +return ERR_PTR (-EXDEV ); + } }Ugh... Wouldn't it be better to take that logics (some equivalent thereof) into
nd_jump_link()? Or just havend_jump_link()return an error...This could be done, but the reason for stashing it away in
last_magiclinkis because of the future magic-link re-opening patches which can't be implemented like that without putting theopen_flagsinside nameidata (which was decided to be too ugly a while ago).My point being that I could implement it this way for this series, but I'd have to implement something like
last_magiclinkwhen I end up re-posting the magic-link stuff in a few weeks.Quoted 6 lines
Looking at all the
nd_jump_link()users, the other option is to just disallow magic-link crossings entirely forLOOKUP_NO_XDEV. The only thing allowing them permits is to resolve file descriptors that are pointing to the same procfs mount -- and it's unclear to me how useful that really is (apparmorfs and nsfs will always give-EXDEVbecauseaafs_mntandnsfs_mntare internal kernel vfsmounts).
Quoted 4 lines
I would rather keep the entire if (
nd->flags&LOOKUP_MAGICLINK_JUMPED) out of theget_link(). If you want to generate some error ifnd_jump_link()has been called, just do it right there. The fewer pieces of state need to be carried around, the better...
Sure, I can make nd_jump_link() give -ELOOP and drop the current need for LOOKUP_MAGICLINK_JUMPED -- if necessary we can re-add it for the magic-link reopening patches.
Quoted 2 lines
And as for opening them... Why would you need full
open_flagsin there? Details, please...
I was referring to [1] which has been dropped from this series. I misspoke -- you don't need the full open_flags, you just need acc_mode in nameidata -- but from memory you (understandably) weren't in favour of that either because it further muddled the open semantics with namei.
So the solution I went with was to stash away the i_mode of the magiclink in nd->last_magiclink.mode (though to avoid a race which Jann found, you actually need to recalculate it when you call nd_jump_link() but that's a different topic) and then check it in trailing_magiclink().
However, I've since figured out that we need to restrict things like bind-mounts and truncate() because they can be used to get around the restrictions. I dropped that patch from this series so that I could work on implementing the restrictions for the other relevant VFS syscalls separately from openat2 (upgrade_mask will be re-added to open_how with those patches).
My point was that AFAICS we will either have to have nd->acc_mode (or something similar) or have nd->last_magiclink in order to implement the magic-link reopening hardening.
[1]: https://lore.kernel.org/lkml/[email protected]/
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
PATCH v15 4/9 namei: LOOKUP_BENEATH: O_BENEATH-like scoped resolution
In reply to Aleksa Sarai/* Background. */
There are many circumstances when userspace wants to resolve a path and ensure that it doesn't go outside of a particular root directory during resolution. Obvious examples include archive extraction tools, as well as other security-conscious userspace programs. FreeBSD spun out O_BENEATH from their Capsicum project[1,2], so it also seems reasonable to implement similar functionality for Linux.
This is part of a refresh of Al's AT_NO_JUMPS patchset[3] (which was a variation on David Drysdale's O_BENEATH patchset[4], which in turn was based on the Capsicum project[5]).
/* Userspace API. */LOOKUP_BENEATH will be exposed to userspace through openat2(2).
/* Semantics. */
Unlike most other LOOKUP flags (most notably LOOKUP_FOLLOW), LOOKUP_BENEATH applies to all components of the path.
With LOOKUP_BENEATH, any path component which attempts to "escape" the starting point of the filesystem lookup (the dirfd passed to openat) will yield -EXDEV. Thus, all absolute paths and symlinks are disallowed.
Due to a security concern brought up by Jann[6], any ".." path components are also blocked. This restriction will be lifted in a future patch, but requires more work to ensure that permitting ".." is done safely.
Magic-link jumps are also blocked, because they can beam the path lookup across the starting point. It would be possible to detect and block only the "bad" crossings with path_is_under() checks, but it's unclear whether it makes sense to permit magic-links at all. However, userspace is recommended to pass LOOKUP_NO_MAGICLINKS if they want to ensure that magic-link crossing is entirely disabled.
/* Testing. */LOOKUP_BENEATH is tested as part of the openat2(2) selftests.
[1]: https://reviews.freebsd.org/D2808
[2]: https://reviews.freebsd.org/D17547
[3]: https://lore.kernel.org/lkml/[email protected]/
[4]: https://lore.kernel.org/lkml/[email protected]/
[5]: https://lore.kernel.org/lkml/[email protected]/
[6]: https://lore.kernel.org/lkml/CAG48ez1jzNvxB+bfOBnERFGp=oMM0vHWuLD6EULmne3R6xa53w@mail.gmail.com/
--- fs/namei.c | 91 +++++++++++++++++++++++++++++++++++-------- include/linux/namei.h | 4 ++ 2 files changed, 79 insertions(+), 16 deletions(-)
fs/namei.c +75 -16
@@ -644,6 +644,14 @@ static bool legitimize_links(struct nameidata *nd)static bool legitimize_root (struct nameidata *nd) { +/* +* For scoped-lookups (where nd->root has been zeroed), we need to +* restart the whole lookup from scratch -- because set_root() is wrong +* for these lookups (nd->dfd is the root, not the filesystem root). +*/ +if (!nd->root.mnt && (nd->flags &LOOKUP_IS_SCOPED )) +return false; +/* Nothing to do if nd->root is zero or is managed by the VFS user. */ if (!nd->root.mnt || (nd->flags &LOOKUP_ROOT ))return true; nd->flags |=LOOKUP_ROOT_GRABBED ;
@@ -779,7 +787,11 @@ static int complete_walk(struct nameidata *nd)int status;if (nd->flags &LOOKUP_RCU ) { -if (!(nd->flags &LOOKUP_ROOT )) +/* +* We don't want to zero nd->root for scoped-lookups or +* externally-managed nd->root. +*/ +if (!(nd->flags & (LOOKUP_ROOT |LOOKUP_IS_SCOPED ))) nd->root.mnt =NULL ;if (unlikely (unlazy_walk (nd)))return -ECHILD ;
@@ -801,10 +813,18 @@ static int complete_walk(struct nameidata *nd)return status; } -static void set_root (struct nameidata *nd) +static int set_root (struct nameidata *nd) {struct fs_struct *fs = current->fs; +/* +* Jumping to the real root in a scoped-lookup is a BUG in namei, but we +* still have to ensure it doesn't happen because it will cause a breakout +* from the dirfd. +*/ +if (WARN_ON (nd->flags &LOOKUP_IS_SCOPED )) +return -ENOTRECOVERABLE ; +if (nd->flags &LOOKUP_RCU ) {unsigned seq;
@@ -817,6 +837,7 @@ static void set_root(struct nameidata *nd)get_fs_root (fs, &nd->root); nd->flags |=LOOKUP_ROOT_GRABBED ; } +return 0 ; }static void path_put_conditional (struct path *path,struct nameidata *nd)
@@ -840,11 +861,18 @@ static inline void path_to_nameidata(const struct path *path,static int nd_jump_root (struct nameidata *nd) { +if (unlikely (nd->flags &LOOKUP_BENEATH )) +return -EXDEV ;if (unlikely (nd->flags &LOOKUP_NO_XDEV )) {/* Absolute path arguments to path_init() are allowed. */ if (nd->path.mnt !=NULL && nd->path.mnt != nd->root.mnt)return -EXDEV ; } +if (!nd->root.mnt) { +int error =set_root (nd); +if (error) +return error; + }if (nd->flags &LOOKUP_RCU ) {struct dentry *d; nd->path = nd->root;
@@ -1096,15 +1124,17 @@ const char *get_link(struct nameidata *nd)if (!nd->last_magiclink.same_mnt)return ERR_PTR (-EXDEV ); } +/* Not currently safe for scoped-lookups. */ +if (unlikely (nd->flags &LOOKUP_IS_SCOPED )) +return ERR_PTR (-EXDEV ); }if (IS_ERR_OR_NULL (res))return res; }if (*res =='/' ) { -if (!nd->root.mnt) -set_root (nd); -if (unlikely (nd_jump_root (nd))) -return ERR_PTR (-ECHILD ); + error =nd_jump_root (nd); +if (unlikely (error)) +return ERR_PTR (error);while (unlikely (*++res =='/' )) ; }
@@ -1373,8 +1403,11 @@ static int follow_dotdot_rcu(struct nameidata *nd)struct inode *inode = nd->inode;while (1 ) { -if (path_equal (&nd->path, &nd->root)) +if (path_equal (&nd->path, &nd->root)) { +if (unlikely (nd->flags &LOOKUP_BENEATH )) +return -EXDEV ;break ; + }if (nd->path.dentry != nd->path.mnt->mnt_root) {struct dentry *old = nd->path.dentry;struct dentry *parent = old->d_parent;
@@ -1505,8 +1538,11 @@ static int path_parent_directory(struct path *path)static int follow_dotdot (struct nameidata *nd) {while (1 ) { -if (path_equal (&nd->path, &nd->root)) +if (path_equal (&nd->path, &nd->root)) { +if (unlikely (nd->flags &LOOKUP_BENEATH )) +return -EXDEV ;break ; + }if (nd->path.dentry != nd->path.mnt->mnt_root) {int ret =path_parent_directory (&nd->path);if (ret)
@@ -1731,8 +1767,20 @@ static inline int may_lookup(struct nameidata *nd)static inline int handle_dots (struct nameidata *nd,int type) {if (type ==LAST_DOTDOT ) { -if (!nd->root.mnt) -set_root (nd); +int error =0 ; + +/* +* Scoped-lookup flags resolving ".." is not currently safe -- +* races can cause our parent to have moved outside of the root +* and us to skip over it. +*/ +if (unlikely (nd->flags &LOOKUP_IS_SCOPED )) +return -EXDEV ; +if (!nd->root.mnt) { + error =set_root (nd); +if (error) +return error; + }if (nd->flags &LOOKUP_RCU ) {return follow_dotdot_rcu (nd); }else
@@ -2195,6 +2243,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)/* must be paired with terminate_walk() */ static const char *path_init (struct nameidata *nd,unsigned flags) { +int error;const char *s = nd->name->name;if (!*s)
@@ -2227,11 +2276,12 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->path.dentry =NULL ; nd->m_seq =read_seqbegin (&mount_lock); + +/* Figure out the starting path and root (if needed). */ if (*s =='/' ) { -set_root (nd); -if (likely (!nd_jump_root (nd))) -return s; -return ERR_PTR (-ECHILD ); + error =nd_jump_root (nd); +if (unlikely (error)) +return ERR_PTR (error); }else if (nd->dfd ==AT_FDCWD ) {if (flags &LOOKUP_RCU ) {struct fs_struct *fs = current->fs;
@@ -2247,7 +2297,6 @@ static const char *path_init(struct nameidata *nd, unsigned flags)get_fs_pwd (current->fs, &nd->path); nd->inode = nd->path.dentry->d_inode; } -return s; }else {/* Caller must check execute permissions on the starting path component */ struct fd f =fdget_raw (nd->dfd);
@@ -2272,8 +2321,18 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->inode = nd->path.dentry->d_inode; }fdput (f); -return s; } +/* For scoped-lookups we need to set the root to the dirfd as well. */ +if (flags &LOOKUP_IS_SCOPED ) { + nd->root = nd->path; +if (flags &LOOKUP_RCU ) { + nd->root_seq = nd->seq; + }else { +path_get (&nd->root); + nd->flags |=LOOKUP_ROOT_GRABBED ; + } + } +return s; }static const char *trailing_symlink (struct nameidata *nd)
include/linux/namei.h +4 -0
@@ -2,6 +2,7 @@#ifndef _LINUX_NAMEI_H#define _LINUX_NAMEI_H +#include <linux/fs.h> #include <linux/kernel.h> #include <linux/path.h> #include <linux/fcntl.h>
@@ -44,6 +45,9 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};#define LOOKUP_NO_SYMLINKS 0x020000/* No symlink crossing. */ #define LOOKUP_NO_MAGICLINKS 0x040000/* No /proc/$pid/fd/ "symlink" crossing. */ #define LOOKUP_NO_XDEV 0x080000/* No mountpoint crossing. */ +#define LOOKUP_BENEATH 0x100000/* No escaping from starting point. */ +/* LOOKUP_* flags which do scope-related checks based on the dirfd. */ +#define LOOKUP_IS_SCOPED LOOKUP_BENEATHextern int path_pts (struct path *path);
Signature · 1 line
2.23.0
Al Viro
maintainerRe: [PATCH v15 4/9] namei: LOOKUP_BENEATH: O_BENEATH-like scoped resolution
On Tue, Nov 05, 2019 at 08:05:48PM +1100, Aleksa Sarai wrote:
Minor nit here - I'd split "move the conditional call of set_root() into nd_jump_root()" into a separate patch before that one. Makes for fewer distractions in this one. I'd probably fold "and be ready for errors other than -ECHILD" into the same preliminary patch.
fs/namei.c const char *get_link(struct nameidata *nd) · line 1129
Quoted 3 lines
fs/namei.c +3
-0+/* Not currently safe for scoped-lookups. */ +if (unlikely (nd->flags &LOOKUP_IS_SCOPED )) +return ERR_PTR (-EXDEV );
Also a candidate for doing in nd_jump_link()...
fs/namei.c static int follow_dotdot_rcu(struct nameidata *nd) · line 1408
Quoted 8 lines
fs/namei.c +3
-1@@ -1373,8 +1403,11 @@ static int follow_dotdot_rcu(struct nameidata *nd)struct inode *inode = nd->inode;while (1 ) { -if (path_equal (&nd->path, &nd->root)) +if (path_equal (&nd->path, &nd->root)) { +if (unlikely (nd->flags &LOOKUP_BENEATH )) +return -EXDEV ;
Umm... Are you sure it's not -ECHILD?
Re: [PATCH v15 4/9] namei: LOOKUP_BENEATH: O_BENEATH-like scoped resolution
Quoted 5 lines · Al Viro
Minor nit here - I'd split "move the conditional call of
set_root()intond_jump_root()" into a separate patch before that one. Makes for fewer distractions in this one. I'd probably fold "and be ready for errors other than-ECHILD" into the same preliminary patch.
Will do.
Quoted 9 lines
fs/namei.c const char *get_link(struct nameidata *nd) · line 1129
Quoted 3 lines
fs/namei.c +3
-0+/* Not currently safe for scoped-lookups. */ +if (unlikely (nd->flags &LOOKUP_IS_SCOPED )) +return ERR_PTR (-EXDEV );Also a candidate for doing in
nd_jump_link()...Quoted 3 lines
fs/namei.c +0
-0@@ -1373,8 +1403,11 @@ static int follow_dotdot_rcu(struct nameidata *nd)struct inode *inode = nd->inode;
Quoted 7 lines
fs/namei.c static int follow_dotdot_rcu(struct nameidata *nd) · line 1408
Quoted 5 lines
fs/namei.c +3
-1while (1 ) { -if (path_equal (&nd->path, &nd->root)) +if (path_equal (&nd->path, &nd->root)) { +if (unlikely (nd->flags &LOOKUP_BENEATH )) +return -EXDEV ;Umm... Are you sure it's not
-ECHILD?
It wouldn't hurt to be -ECHILD -- though it's not clear to me how likely a success would be in REF-walk if the parent components didn't already trigger an unlazy_walk() in RCU-walk.
I guess that also means LOOKUP_NO_XDEV should trigger -ECHILD in follow_dotdot_rcu()?
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
Re: [PATCH v15 4/9] namei: LOOKUP_BENEATH: O_BENEATH-like scoped resolution
Quoted 26 lines · Aleksa Sarai
Quoted 5 lines · Al Viro
Minor nit here - I'd split "move the conditional call of
set_root()intond_jump_root()" into a separate patch before that one. Makes for fewer distractions in this one. I'd probably fold "and be ready for errors other than-ECHILD" into the same preliminary patch.Will do.
Quoted 9 lines
fs/namei.c const char *get_link(struct nameidata *nd) · line 1129
Quoted 3 lines
fs/namei.c +3
-0+/* Not currently safe for scoped-lookups. */ +if (unlikely (nd->flags &LOOKUP_IS_SCOPED )) +return ERR_PTR (-EXDEV );Also a candidate for doing in
nd_jump_link()...Quoted 3 lines
fs/namei.c +0
-0@@ -1373,8 +1403,11 @@ static int follow_dotdot_rcu(struct nameidata *nd)struct inode *inode = nd->inode;Quoted 7 lines
fs/namei.c static int follow_dotdot_rcu(struct nameidata *nd) · line 1408
Quoted 5 lines
fs/namei.c +3
-1while (1 ) { -if (path_equal (&nd->path, &nd->root)) +if (path_equal (&nd->path, &nd->root)) { +if (unlikely (nd->flags &LOOKUP_BENEATH )) +return -EXDEV ;Umm... Are you sure it's not
-ECHILD?
Quoted 6 lines
It wouldn't hurt to be
-ECHILD-- though it's not clear to me how likely a success would be in REF-walk if the parent components didn't already trigger anunlazy_walk()in RCU-walk.I guess that also means
LOOKUP_NO_XDEVshould trigger-ECHILDinfollow_dotdot_rcu()?
Scratch the last question -- AFAICS we don't need to do that for LOOKUP_NO_XDEV because we check against mount_lock so it's very unlikely that -ECHILD will have any benefit.
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
PATCH v15 5/9 namei: LOOKUP_IN_ROOT: chroot-like scoped resolution
In reply to Aleksa Sarai/* Background. */
Container runtimes or other administrative management processes will often interact with root filesystems while in the host mount namespace, because the cost of doing a chroot(2) on every operation is too prohibitive (especially in Go, which cannot safely use vfork). However, a malicious program can trick the management process into doing operations on files outside of the root filesystem through careful crafting of symlinks.
Most programs that need this feature have attempted to make this process safe, by doing all of the path resolution in userspace (with symlinks being scoped to the root of the malicious root filesystem). Unfortunately, this method is prone to foot-guns and usually such implementations have subtle security bugs.
Thus, what userspace needs is a way to resolve a path as though it were in a chroot(2) -- with all absolute symlinks being resolved relative to the dirfd root (and ".." components being stuck under the dirfd root). It is much simpler and more straight-forward to provide this functionality in-kernel (because it can be done far more cheaply and correctly).
More classical applications that also have this problem (which have their own potentially buggy userspace path sanitisation code) include web servers, archive extraction tools, network file servers, and so on.
/* Userspace API. */LOOKUP_IN_ROOT will be exposed to userspace through openat2(2).
/* Semantics. */
Unlike most other LOOKUP flags (most notably LOOKUP_FOLLOW), LOOKUP_IN_ROOT applies to all components of the path.
With LOOKUP_IN_ROOT, any path component which attempts to cross the starting point of the pathname lookup (the dirfd passed to openat) will remain at the starting point. Thus, all absolute paths and symlinks will be scoped within the starting point.
There is a slight change in behaviour regarding pathnames -- if the pathname is absolute then the dirfd is still used as the root of resolution of LOOKUP_IN_ROOT is specified (this is to avoid obvious foot-guns, at the cost of a minor API inconsistency).
As with LOOKUP_BENEATH, Jann's security concern about ".."[1] applies to LOOKUP_IN_ROOT -- therefore ".." resolution is blocked. This restriction will be lifted in a future patch, but requires more work to ensure that permitting ".." is done safely.
Magic-link jumps are also blocked, because they can beam the path lookup across the starting point. It would be possible to detect and block only the "bad" crossings with path_is_under() checks, but it's unclear whether it makes sense to permit magic-links at all. However, userspace is recommended to pass LOOKUP_NO_MAGICLINKS if they want to ensure that magic-link crossing is entirely disabled.
/* Testing. */LOOKUP_IN_ROOT is tested as part of the openat2(2) selftests.
[1]: https://lore.kernel.org/lkml/CAG48ez1jzNvxB+bfOBnERFGp=oMM0vHWuLD6EULmne3R6xa53w@mail.gmail.com/
--- fs/namei.c | 15 ++++++++++++--- include/linux/namei.h | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-)
fs/namei.c +12 -3
@@ -2277,12 +2277,20 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->m_seq =read_seqbegin (&mount_lock); -/* Figure out the starting path and root (if needed). */ -if (*s =='/' ) { +/* Absolute pathname -- fetch the root. */ +if (flags &LOOKUP_IN_ROOT ) { +/* With LOOKUP_IN_ROOT, act as a relative path. */ +while (*s =='/' ) + s++; + }else if (*s =='/' ) { error =nd_jump_root (nd);if (unlikely (error))return ERR_PTR (error); - }else if (nd->dfd ==AT_FDCWD ) { +return s; + } + +/* Relative pathname -- get the starting-point it is relative to. */ +if (nd->dfd ==AT_FDCWD ) {if (flags &LOOKUP_RCU ) {struct fs_struct *fs = current->fs;unsigned seq;
@@ -2322,6 +2330,7 @@ static const char *path_init(struct nameidata *nd, unsigned flags) }fdput (f); } +/* For scoped-lookups we need to set the root to the dirfd as well. */ if (flags &LOOKUP_IS_SCOPED ) { nd->root = nd->path;
include/linux/namei.h +2 -1
@@ -46,8 +46,9 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};#define LOOKUP_NO_MAGICLINKS 0x040000/* No /proc/$pid/fd/ "symlink" crossing. */ #define LOOKUP_NO_XDEV 0x080000/* No mountpoint crossing. */ #define LOOKUP_BENEATH 0x100000/* No escaping from starting point. */ +#define LOOKUP_IN_ROOT 0x200000/* Treat dirfd as %current->fs->root. */ /* LOOKUP_* flags which do scope-related checks based on the dirfd. */ -#define LOOKUP_IS_SCOPED LOOKUP_BENEATH +#define LOOKUP_IS_SCOPED (LOOKUP_BENEATH | LOOKUP_IN_ROOT)extern int path_pts (struct path *path);
Signature · 1 line
2.23.0
Al Viro
maintainerRe: [PATCH v15 5/9] namei: LOOKUP_IN_ROOT: chroot-like scoped resolution
fs/namei.c static const char *path_init(struct nameidata *nd, unsigned flags) · line 2284
Quoted 11 lines · Aleksa Sarai
fs/namei.c +5
-2@@ -2277,12 +2277,20 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->m_seq =read_seqbegin (&mount_lock); -/* Figure out the starting path and root (if needed). */ -if (*s =='/' ) { +/* Absolute pathname -- fetch the root. */ +if (flags &LOOKUP_IN_ROOT ) { +/* With LOOKUP_IN_ROOT, act as a relative path. */ +while (*s =='/' ) + s++;
Er... Why bother skipping slashes? I mean, not only link_path_walk() will skip them just fine, you are actually risking breakage in this:
if (*s && unlikely(!d_can_lookup(dentry))) {
fdput(f);
return ERR_PTR(-ENOTDIR);
}which is downstream from there with you patch, AFAICS.
Re: [PATCH v15 5/9] namei: LOOKUP_IN_ROOT: chroot-like scoped resolution
Quoted 16 lines · Al Viro
fs/namei.c static const char *path_init(struct nameidata *nd, unsigned flags) · line 2284
Quoted 11 lines · Aleksa Sarai
fs/namei.c +5
-2@@ -2277,12 +2277,20 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->m_seq =read_seqbegin (&mount_lock); -/* Figure out the starting path and root (if needed). */ -if (*s =='/' ) { +/* Absolute pathname -- fetch the root. */ +if (flags &LOOKUP_IN_ROOT ) { +/* With LOOKUP_IN_ROOT, act as a relative path. */ +while (*s =='/' ) + s++;Er... Why bother skipping slashes? I mean, not only
link_path_walk()will skip them just fine, you are actually risking breakage in this:
Quoted 5 lines
if (*s && unlikely(!d_can_lookup(dentry))) { fdput(f); return ERR_PTR(-ENOTDIR); }which is downstream from there with you patch, AFAICS.
I switched to stripping the slashes at your suggestion a few revisions ago[1], and had (wrongly) assumed we needed to handle "/" somehow in path_init(). But you're quite right about link_path_walk() -- and I'd be more than happy to drop it.
[1]: https://lore.kernel.org/lkml/[email protected]/
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
Al Viro
maintainerRe: [PATCH v15 5/9] namei: LOOKUP_IN_ROOT: chroot-like scoped resolution
Quoted 23 lines · Aleksa Sarai
Quoted 16 lines · Al Viro
fs/namei.c static const char *path_init(struct nameidata *nd, unsigned flags) · line 2284
Quoted 11 lines · Aleksa Sarai
fs/namei.c +5
-2@@ -2277,12 +2277,20 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->m_seq =read_seqbegin (&mount_lock); -/* Figure out the starting path and root (if needed). */ -if (*s =='/' ) { +/* Absolute pathname -- fetch the root. */ +if (flags &LOOKUP_IN_ROOT ) { +/* With LOOKUP_IN_ROOT, act as a relative path. */ +while (*s =='/' ) + s++;Er... Why bother skipping slashes? I mean, not only
link_path_walk()will skip them just fine, you are actually risking breakage in this:Quoted 5 lines
if (*s && unlikely(!d_can_lookup(dentry))) { fdput(f); return ERR_PTR(-ENOTDIR); }which is downstream from there with you patch, AFAICS.
Quoted 4 lines
I switched to stripping the slashes at your suggestion a few revisions ago[1], and had (wrongly) assumed we needed to handle "/" somehow in
path_init(). But you're quite right aboutlink_path_walk()-- and I'd be more than happy to drop it.
That, IIRC, was about untangling the weirdness around multiple calls of dirfd_path_init() and basically went "we might want just strip the slashes in case of that flag very early in the entire thing, so that later the normal logics for absolute/relative would DTRT". Since your check is right next to checking for absolute pathnames (and not in the very beginning of path_init()), we might as well turn the check for absolute pathname into *s == '/' && !(flags & LOOKUP_IN_ROOT) and be done with that.
Re: [PATCH v15 5/9] namei: LOOKUP_IN_ROOT: chroot-like scoped resolution
Quoted 29 lines · Al Viro
Quoted 23 lines · Aleksa Sarai
Quoted 16 lines · Al Viro
fs/namei.c static const char *path_init(struct nameidata *nd, unsigned flags) · line 2284
Quoted 11 lines · Aleksa Sarai
fs/namei.c +5
-2@@ -2277,12 +2277,20 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->m_seq =read_seqbegin (&mount_lock); -/* Figure out the starting path and root (if needed). */ -if (*s =='/' ) { +/* Absolute pathname -- fetch the root. */ +if (flags &LOOKUP_IN_ROOT ) { +/* With LOOKUP_IN_ROOT, act as a relative path. */ +while (*s =='/' ) + s++;Er... Why bother skipping slashes? I mean, not only
link_path_walk()will skip them just fine, you are actually risking breakage in this:Quoted 5 lines
if (*s && unlikely(!d_can_lookup(dentry))) { fdput(f); return ERR_PTR(-ENOTDIR); }which is downstream from there with you patch, AFAICS.
Quoted 4 lines
I switched to stripping the slashes at your suggestion a few revisions ago[1], and had (wrongly) assumed we needed to handle "/" somehow in
path_init(). But you're quite right aboutlink_path_walk()-- and I'd be more than happy to drop it.
Quoted 4 lines
That, IIRC, was about untangling the weirdness around multiple calls of
dirfd_path_init()and basically went "we might want just strip the slashes in case of that flag very early in the entire thing, so that later the normal logics for absolute/relative would DTRT".
Ah okay, I'd misunderstood the point you were making in that thread.
Quoted 4 lines
Since your check is right next to checking for absolute pathnames (and not in the very beginning of
path_init()), we might as well turn the check for absolute pathname into *s == '/' && !(flags &LOOKUP_IN_ROOT) and be done with that.
Yup, agreed.
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
PATCH v15 6/9 namei: LOOKUP_{IN_ROOT,BENEATH}: permit limited ".." resolution
In reply to Aleksa SaraiAllow LOOKUP_BENEATH and LOOKUP_IN_ROOT to safely permit ".." resolution (in the case of LOOKUP_BENEATH the resolution will still fail if ".." resolution would resolve a path outside of the root -- while LOOKUP_IN_ROOT will chroot(2)-style scope it). Magic-link jumps are still disallowed entirely[*].
As Jann explains[1,2], the need for this patch (and the original no-".." restriction) is explained by observing there is a fairly easy-to-exploit race condition with chroot(2) (and thus by extension LOOKUP_IN_ROOT and LOOKUP_BENEATH if ".." is allowed) where a rename(2) of a path can be used to "skip over" nd->root and thus escape to the filesystem above nd->root.
thread1 [attacker]:
for (;;)
renameat2(AT_FDCWD, "/a/b/c", AT_FDCWD, "/a/d", RENAME_EXCHANGE);
thread2 [victim]:
for (;;)
openat2(dirb, "b/c/../../etc/shadow",
{ .flags = O_PATH, .resolve = RESOLVE_IN_ROOT } );With fairly significant regularity, thread2 will resolve to "/etc/shadow" rather than "/a/b/etc/shadow". There is also a similar (though somewhat more privileged) attack using MS_MOVE.
With this patch, such cases will be detected *during* ".." resolution and will return -EAGAIN for userspace to decide to either retry or abort the lookup. It should be noted that ".." is the weak point of chroot(2) -- walking *into* a subdirectory tautologically cannot result in you walking *outside* nd->root (except through a bind-mount or magic-link). There is also no other way for a directory's parent to change (which is the primary worry with ".." resolution here) other than a rename or MS_MOVE.
This is a first-pass implementation, where -EAGAIN will be returned if any rename or mount occurs anywhere on the host (in any namespace). This will result in spurious errors, but there isn't a satisfactory alternative (other than denying ".." altogether).
One other possible alternative (which previous versions of this patch used) would be to check with path_is_under() if there was a racing rename or mount (after re-taking the relevant seqlocks). While this does work, it results in possible O(n*m) behaviour if there are many renames or mounts occuring *anywhere on the system*.
A variant of the above attack is included in the selftests for openat2(2) later in this patch series. I've run this test on several machines for several days and no instances of a breakout were detected. While this is not concrete proof that this is safe, when combined with the above argument it should lend some trustworthiness to this construction.
[*] It may be acceptable in the future to do a path_is_under() check (as
with the alternative solution for "..") for magic-links after they are resolved. However this seems unlikely to be a feature that people *really* need -- it can be added later if it turns out a lot of people want it.
[1]: https://lore.kernel.org/lkml/CAG48ez1jzNvxB+bfOBnERFGp=oMM0vHWuLD6EULmne3R6xa53w@mail.gmail.com/
[2]: https://lore.kernel.org/lkml/CAG48ez30WJhbsro2HOc_DR7V91M+hNFzBP5ogRMZaxbAORvqzg@mail.gmail.com/
--- fs/namei.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
fs/namei.c +29 -13
@@ -491,7 +491,7 @@ struct nameidata {struct path root;struct inode *inode;/* path.dentry.d_inode */ unsigned int flags; -unsigned seq, m_seq; +unsigned seq, m_seq, r_seq;int last_type;unsigned depth;int total_link_count;
@@ -1769,22 +1769,35 @@ static inline int handle_dots(struct nameidata *nd, int type)if (type ==LAST_DOTDOT ) {int error =0 ; -/* -* Scoped-lookup flags resolving ".." is not currently safe -- -* races can cause our parent to have moved outside of the root -* and us to skip over it. -*/ -if (unlikely (nd->flags &LOOKUP_IS_SCOPED )) -return -EXDEV ;if (!nd->root.mnt) { error =set_root (nd);if (error)return error; } -if (nd->flags &LOOKUP_RCU ) { -return follow_dotdot_rcu (nd); - }else -return follow_dotdot (nd); +if (nd->flags &LOOKUP_RCU ) + error =follow_dotdot_rcu (nd); +else + error =follow_dotdot (nd); +if (error) +return error; + +if (unlikely (nd->flags &LOOKUP_IS_SCOPED )) { +bool m_retry =read_seqretry (&mount_lock, nd->m_seq); +bool r_retry =read_seqretry (&rename_lock, nd->r_seq); + +/* +* If there was a racing rename or mount along our +* path, then we can't be sure that ".." hasn't jumped +* above nd->root (and so userspace should retry or use +* some fallback). +* +* In future we could do a path_is_under() check here +* instead, but there are O(n*m) performance +* considerations with such a setup. +*/ +if (unlikely (m_retry || r_retry)) +return -EAGAIN ; + } }return 0 ; }
@@ -2254,6 +2267,10 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->last_type =LAST_ROOT ;/* if there are only slashes... */ nd->flags = flags |LOOKUP_JUMPED |LOOKUP_PARENT ; nd->depth =0 ; + + nd->m_seq =read_seqbegin (&mount_lock); + nd->r_seq =read_seqbegin (&rename_lock); +if (flags &LOOKUP_ROOT ) {struct dentry *root = nd->root.dentry;struct inode *inode = root->d_inode;
@@ -2275,7 +2292,6 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->path.mnt =NULL ; nd->path.dentry =NULL ; - nd->m_seq =read_seqbegin (&mount_lock);/* Absolute pathname -- fetch the root. */ if (flags &LOOKUP_IN_ROOT ) {
Signature · 1 line
2.23.0
Al Viro
maintainerRe: [PATCH v15 6/9] namei: LOOKUP_{IN_ROOT,BENEATH}: permit limited ".." resolution
Quoted 5 lines · Aleksa Sarai
One other possible alternative (which previous versions of this patch used) would be to check with
path_is_under()if there was a racing rename or mount (after re-taking the relevant seqlocks). While this does work, it results in possibleO(n*m)behaviour if there are many renames or mounts occuring *anywhere on the system*.
BTW, do you realize that open-by-fhandle (or working nfsd, for that matter) will trigger arseloads of write_seqlock(&rename_lock) simply on d_splice_alias() bringing disconnected subtrees in contact with parent?
Re: [PATCH v15 6/9] namei: LOOKUP_{IN_ROOT,BENEATH}: permit limited ".." resolution
Quoted 11 lines · Al Viro
Quoted 5 lines · Aleksa Sarai
One other possible alternative (which previous versions of this patch used) would be to check with
path_is_under()if there was a racing rename or mount (after re-taking the relevant seqlocks). While this does work, it results in possibleO(n*m)behaviour if there are many renames or mounts occuring *anywhere on the system*.BTW, do you realize that open-by-fhandle (or working nfsd, for that matter) will trigger arseloads of
write_seqlock(&rename_lock)simply ond_splice_alias()bringing disconnected subtrees in contact with parent?
I wasn't aware of that -- that makes path_is_under() even less viable. I'll reword it to be clearer that path_is_under() isn't a good idea and why we went with -EAGAIN over an in-kernel retry.
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
PATCH v15 7/9 open: introduce openat2(2) syscall
In reply to Aleksa Sarai/* Background. */
For a very long time, extending openat(2) with new features has been incredibly frustrating. This stems from the fact that openat(2) is possibly the most famous counter-example to the mantra "don't silently accept garbage from userspace" -- it doesn't check whether unknown flags are present[1].
This means that (generally) the addition of new flags to openat(2) has been fraught with backwards-compatibility issues (O_TMPFILE has to be defined as __O_TMPFILE|O_DIRECTORY|[O_RDWR or O_WRONLY] to ensure old kernels gave errors, since it's insecure to silently ignore the flag[2]). All new security-related flags therefore have a tough road to being added to openat(2).
Userspace also has a hard time figuring out whether a particular flag is supported on a particular kernel. While it is now possible with contemporary kernels (thanks to [3]), older kernels will expose unknown flag bits through fcntl(F_GETFL). Giving a clear -EINVAL during openat(2) time matches modern syscall designs and is far more fool-proof.
In addition, the newly-added path resolution restriction LOOKUP flags (which we would like to expose to user-space) don't feel related to the pre-existing O_* flag set -- they affect all components of path lookup. We'd therefore like to add a new flag argument.
Adding a new syscall allows us to finally fix the flag-ignoring problem, and we can make it extensible enough so that we will hopefully never need an openat3(2).
/* Syscall Prototype. */
/*
* open_how is an extensible structure (similar in interface to
* clone3(2) or sched_setattr(2)). The size parameter must be set to
* sizeof(struct open_how), to allow for future extensions. All future
* extensions will be appended to open_how, with their zero value
* acting as a no-op default.
*/
struct open_how { /* ... */ };
int openat2(int dfd, const char *pathname,
struct open_how *how, size_t size);
/* Description. */
The initial version of 'struct open_how' contains the following fields:
flags
Used to specify openat(2)-style flags. However, any unknown flag bits or otherwise incorrect flag combinations (like O_PATH|O_RDWR) will result in -EINVAL. In addition, this field is 64-bits wide to allow for more O_ flags than currently permitted with openat(2).
mode
The file mode for O_CREAT or O_TMPFILE.
Must be set to zero if flags does not contain O_CREAT or O_TMPFILE.
__padding
Must be set to all zeroes.
resolve
Restrict path resolution (in contrast to O_* flags they affect all path components). The current set of flags are as follows (at the moment, all of the RESOLVE_ flags are implemented as just passing the corresponding LOOKUP_ flag).
RESOLVE_NO_XDEV => LOOKUP_NO_XDEV
RESOLVE_NO_SYMLINKS => LOOKUP_NO_SYMLINKS
RESOLVE_NO_MAGICLINKS => LOOKUP_NO_MAGICLINKS
RESOLVE_BENEATH => LOOKUP_BENEATH
RESOLVE_IN_ROOT => LOOKUP_IN_ROOT
open_how does not contain an embedded size field, because it is of little benefit (userspace can figure out the kernel open_how size at runtime fairly easily without it).
Note that as a result of the new how->flags handling, O_PATH|O_TMPFILE is no longer permitted for openat(2). As far as I can tell, this has always been a bug and appears to not be used by userspace (and I've not seen any problems on my machines by disallowing it). If it turns out this breaks something, we can special-case it and only permit it for openat(2) but not openat2(2).
/* Testing. */
In a follow-up patch there are over 200 selftests which ensure that this syscall has the correct semantics and will correctly handle several attack scenarios.
In addition, I've written a userspace library[4] which provides convenient wrappers around openat2(RESOLVE_IN_ROOT) (this is necessary because no other syscalls support RESOLVE_IN_ROOT, and thus lots of care must be taken when using RESOLVE_IN_ROOT'd file descriptors with other syscalls). During the development of this patch, I've run numerous verification tests using libpathrs (showing that the API is reasonably usable by userspace).
/* Future Work. */
Additional RESOLVE_ flags have been suggested during the review period. These can be easily implemented separately (such as blocking auto-mount during resolution).
Furthermore, there are some other proposed changes to the openat(2) interface (the most obvious example is magic-link hardening[5]) which would be a good opportunity to add a way for userspace to restrict how O_PATH file descriptors can be re-opened.
[1]: https://lwn.net/Articles/588444/
[2]: https://lore.kernel.org/lkml/CA+55aFyyxJL1LyXZeBsf2ypriraj5ut1XkNDsunRBqgVjZU_6Q@mail.gmail.com
[3]: commit 629e014bb834 ("fs: completely ignore unknown open flags")
[4]: https://sourceware.org/bugzilla/show_bug.cgi?id=17523
[5]: https://lore.kernel.org/lkml/[email protected]/
--- CREDITS | 4 +- arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 + arch/ia64/kernel/syscalls/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + fs/open.c | 149 +++++++++++++++----- include/linux/fcntl.h | 12 +- include/linux/syscalls.h | 3 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/fcntl.h | 41 ++++++ 24 files changed, 196 insertions(+), 38 deletions(-)
CREDITS +3 -1
@@ -3301,7 +3301,9 @@ S: France N: Aleksa Sarai E: [email protected] W: https://www.cyphar.com/ -D: `pids` cgroup subsystem +D: /sys/fs/cgroup/pids +D: openat2(2) +S: Sydney, Australia N: Dipankar Sarma E: [email protected]
arch/alpha/kernel/syscalls/syscall.tbl +1 -0
@@ -475,3 +475,4 @@ 543 common fspick sys_fspick 544 common pidfd_open sys_pidfd_open # 545 reserved for clone3 +547 common openat2 sys_openat2
arch/arm/tools/syscall.tbl +1 -0
@@ -449,3 +449,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open 435 common clone3 sys_clone3 +437 common openat2 sys_openat2
arch/arm64/include/asm/unistd.h +1 -1
@@ -38,7 +38,7 @@#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) -#define __NR_compat_syscalls 436 +#define __NR_compat_syscalls 438#endif #define __ARCH_WANT_SYS_CLONE
arch/arm64/include/asm/unistd32.h +2 -0
@@ -879,6 +879,8 @@ __SYSCALL(__NR_fspick, sys_fspick) __SYSCALL(__NR_pidfd_open, sys_pidfd_open)#define __NR_clone3 435 __SYSCALL(__NR_clone3, sys_clone3) +#define __NR_openat2 437 +__SYSCALL (__NR_openat2, sys_openat2)/* * Please add new compat syscalls above this comment and update
arch/ia64/kernel/syscalls/syscall.tbl +1 -0
@@ -356,3 +356,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open # 435 reserved for clone3 +437 common openat2 sys_openat2
arch/m68k/kernel/syscalls/syscall.tbl +1 -0
@@ -435,3 +435,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open # 435 reserved for clone3 +437 common openat2 sys_openat2
arch/microblaze/kernel/syscalls/syscall.tbl +1 -0
@@ -441,3 +441,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open 435 common clone3 sys_clone3 +437 common openat2 sys_openat2
arch/mips/kernel/syscalls/syscall_n32.tbl +1 -0
@@ -374,3 +374,4 @@ 433 n32 fspick sys_fspick 434 n32 pidfd_open sys_pidfd_open 435 n32 clone3 __sys_clone3 +437 n32 openat2 sys_openat2
arch/mips/kernel/syscalls/syscall_n64.tbl +1 -0
@@ -350,3 +350,4 @@ 433 n64 fspick sys_fspick 434 n64 pidfd_open sys_pidfd_open 435 n64 clone3 __sys_clone3 +437 n64 openat2 sys_openat2
arch/mips/kernel/syscalls/syscall_o32.tbl +1 -0
@@ -423,3 +423,4 @@ 433 o32 fspick sys_fspick 434 o32 pidfd_open sys_pidfd_open 435 o32 clone3 __sys_clone3 +437 o32 openat2 sys_openat2
arch/parisc/kernel/syscalls/syscall.tbl +1 -0
@@ -433,3 +433,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open 435 common clone3 sys_clone3_wrapper +437 common openat2 sys_openat2
arch/powerpc/kernel/syscalls/syscall.tbl +1 -0
@@ -517,3 +517,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open 435 nospu clone3 ppc_clone3 +437 common openat2 sys_openat2
arch/s390/kernel/syscalls/syscall.tbl +1 -0
@@ -438,3 +438,4 @@ 433 common fspick sys_fspick sys_fspick 434 common pidfd_open sys_pidfd_open sys_pidfd_open 435 common clone3 sys_clone3 sys_clone3 +437 common openat2 sys_openat2 sys_openat2
arch/sh/kernel/syscalls/syscall.tbl +1 -0
@@ -438,3 +438,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open # 435 reserved for clone3 +437 common openat2 sys_openat2
arch/sparc/kernel/syscalls/syscall.tbl +1 -0
@@ -481,3 +481,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open # 435 reserved for clone3 +437 common openat2 sys_openat2
arch/x86/entry/syscalls/syscall_32.tbl +1 -0
@@ -440,3 +440,4 @@ 433 i386 fspick sys_fspick __ia32_sys_fspick 434 i386 pidfd_open sys_pidfd_open __ia32_sys_pidfd_open 435 i386 clone3 sys_clone3 __ia32_sys_clone3 +437 i386 openat2 sys_openat2 __ia32_sys_openat2
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
@@ -357,6 +357,7 @@ 433 common fspick __x64_sys_fspick 434 common pidfd_open __x64_sys_pidfd_open 435 common clone3 __x64_sys_clone3/ptregs +437 common openat2 __x64_sys_openat2 # # x32-specific system call numbers start at 512 to avoid cache impact
arch/xtensa/kernel/syscalls/syscall.tbl +1 -0
@@ -406,3 +406,4 @@ 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open 435 common clone3 sys_clone3 +437 common openat2 sys_openat2
fs/open.c +115 -34
223 lines not on this page · raw message
include/linux/fcntl.h +11 -1
@@ -2,15 +2,25 @@#ifndef _LINUX_FCNTL_H#define _LINUX_FCNTL_H +#include <linux/stat.h> #include <uapi/linux/fcntl.h> -/* list of all valid flags for the open/openat flags argument: */ +/* List of all valid flags for the open/openat flags argument: */ #define VALID_OPEN_FLAGS \ (O_RDONLY | O_WRONLY | O_RDWR | O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC | \ O_APPEND | O_NDELAY | O_NONBLOCK | O_NDELAY | __O_SYNC | O_DSYNC | \ FASYNC | O_DIRECT | O_LARGEFILE | O_DIRECTORY | O_NOFOLLOW | \ O_NOATIME | O_CLOEXEC | O_PATH | __O_TMPFILE) +/* List of all valid flags for the how->upgrade_mask argument: */ +#define VALID_UPGRADE_FLAGS \ + (UPGRADE_NOWRITE | UPGRADE_NOREAD) + +/* List of all valid flags for the how->resolve argument: */ +#define VALID_RESOLVE_FLAGS \ + (RESOLVE_NO_XDEV | RESOLVE_NO_MAGICLINKS | RESOLVE_NO_SYMLINKS | \ + RESOLVE_BENEATH | RESOLVE_IN_ROOT) +#ifndef force_o_largefile#define force_o_largefile () (!IS_ENABLED(CONFIG_ARCH_32BIT_OFF_T))#endif
include/linux/syscalls.h +3 -0
@@ -69,6 +69,7 @@ struct rseq;union bpf_attr ;struct io_uring_params ;struct clone_args ; +struct open_how ;#include <linux/types.h> #include <linux/aio_abi.h>
@@ -439,6 +440,8 @@ asmlinkage long sys_fchownat(int dfd, const char __user *filename, uid_t user,asmlinkage long sys_fchown (unsigned int fd,uid_t user,gid_t group);asmlinkage long sys_openat (int dfd,const char __user *filename,int flags,umode_t mode); +asmlinkage long sys_openat2 (int dfd,const char __user *filename, +struct open_how *how,size_t size);asmlinkage long sys_close (unsigned int fd);asmlinkage long sys_vhangup (void );
include/uapi/asm-generic/unistd.h +4 -1
@@ -851,8 +851,11 @@ __SYSCALL(__NR_pidfd_open, sys_pidfd_open) __SYSCALL(__NR_clone3, sys_clone3)#endif +#define __NR_openat2 437 +__SYSCALL(__NR_openat2, sys_openat2) +#undef __NR_syscalls -#define __NR_syscalls 436 +#define __NR_syscalls 438/* * 32 bit systems traditionally used different
include/uapi/linux/fcntl.h +41 -0
46 lines not on this page · raw message
Signature · 1 line
2.23.0
Al Viro
maintainerQuoted 11 lines · Aleksa Sarai
+/*
+ * Arguments for how openat2(2) should open the target path. If @resolve is
+ * zero, then openat2(2) operates very similarly to openat(2).
+ *
+ * However, unlike openat(2), unknown bits in @flags result in-EINVALrather
+ * than being silently ignored. @mode must be zero unless one of {O_CREAT,
+ *O_TMPFILE} are set, and @upgrade_mask must be zero unlessO_PATHis set.
+ *
+ * @flags: O_* flags.
+ * @mode: O_CREAT/O_TMPFILE file mode.
+ * @upgrade_mask: UPGRADE_* flags (to restrictO_PATHre-opening).
???
Quoted 8 lines
+ * @resolve: RESOLVE_* flags.
+ */include/uapi/linux/fcntl.h +6
-0+struct open_how { +__aligned_u64 flags; +__u16 mode; +__u16 __padding[3 ];/* must be zeroed */ +__aligned_u64 resolve; +};
Quoted 13 lines · Al Viro
Quoted 11 lines · Aleksa Sarai
+/*
+ * Arguments for how openat2(2) should open the target path. If @resolve is
+ * zero, then openat2(2) operates very similarly to openat(2).
+ *
+ * However, unlike openat(2), unknown bits in @flags result in-EINVALrather
+ * than being silently ignored. @mode must be zero unless one of {O_CREAT,
+ *O_TMPFILE} are set, and @upgrade_mask must be zero unlessO_PATHis set.
+ *
+ * @flags: O_* flags.
+ * @mode: O_CREAT/O_TMPFILE file mode.
+ * @upgrade_mask: UPGRADE_* flags (to restrictO_PATHre-opening).
Quoted 1 line
???
Sorry, that was left over from a previous revision (where the magic-link re-opening restrictions were part of this series).
Quoted 8 lines
Quoted 8 lines
+ * @resolve: RESOLVE_* flags.
+ */include/uapi/linux/fcntl.h +6
-0+struct open_how { +__aligned_u64 flags; +__u16 mode; +__u16 __padding[3 ];/* must be zeroed */ +__aligned_u64 resolve; +};
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v15 8/9 selftests: add openat2(2) selftests
In reply to Aleksa SaraiTest all of the various openat2(2) flags. A small stress-test of a symlink-rename attack is included to show that the protections against ".."-based attacks are sufficient.
The main things these self-tests are enforcing are:
* The struct+usize ABI for openat2(2) and copy_struct_from_user() to ensure that upgrades will be handled gracefully (in addition, ensuring that misaligned structures are also handled correctly).
* The -EINVAL checks for openat2(2) are all correctly handled to avoid userspace passing unknown or conflicting flag sets (most importantly, ensuring that invalid flag combinations are checked).
* All of the RESOLVE_* semantics (including errno values) are correctly handled with various combinations of paths and flags.
* RESOLVE_IN_ROOT correctly protects against the symlink rename(2) attack that has been responsible for several CVEs (and likely will be responsible for several more).
--- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/openat2/.gitignore | 1 + tools/testing/selftests/openat2/Makefile | 8 + tools/testing/selftests/openat2/helpers.c | 109 ++++ tools/testing/selftests/openat2/helpers.h | 107 ++++ .../testing/selftests/openat2/openat2_test.c | 316 +++++++++++ .../selftests/openat2/rename_attack_test.c | 160 ++++++ .../testing/selftests/openat2/resolve_test.c | 523 ++++++++++++++++++ 8 files changed, 1225 insertions(+) create mode 100644 tools/testing/selftests/openat2/.gitignore create mode 100644 tools/testing/selftests/openat2/Makefile create mode 100644 tools/testing/selftests/openat2/helpers.c create mode 100644 tools/testing/selftests/openat2/helpers.h create mode 100644 tools/testing/selftests/openat2/openat2_test.c create mode 100644 tools/testing/selftests/openat2/rename_attack_test.c create mode 100644 tools/testing/selftests/openat2/resolve_test.c
tools/testing/selftests/Makefile +1 -0
@@ -37,6 +37,7 @@ TARGETS += powerpc TARGETS += proc TARGETS += pstore TARGETS += ptrace +TARGETS += openat2 TARGETS += rseq TARGETS += rtc TARGETS += seccomp
tools/testing/selftests/openat2/.gitignore new file +1 -0
@@ -0,0 +1 @@ +/*_test
tools/testing/selftests/openat2/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined +TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test + +include ../lib.mk + +$(TEST_GEN_PROGS): helpers.c
tools/testing/selftests/openat2/helpers.c new file +109 -0
109 lines not on this page · raw message
tools/testing/selftests/openat2/helpers.h new file +107 -0
107 lines not on this page · raw message
tools/testing/selftests/openat2/openat2_test.c new file +316 -0
316 lines not on this page · raw message
tools/testing/selftests/openat2/rename_attack_test.c new file +160 -0
160 lines not on this page · raw message
tools/testing/selftests/openat2/resolve_test.c new file +523 -0
523 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v15 9/9 Documentation: path-lookup: mention LOOKUP_MAGICLINK_JUMPED
In reply to Aleksa SaraiNow that we have a special flag to signify magic-link jumps, mention it within the path-lookup docs. And now that "magic link" is the correct term for nd_jump_link()-style symlinks, clean up references to this type of "symlink".
--- Documentation/filesystems/path-lookup.rst | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
Documentation/filesystems/path-lookup.rst +12 -6
@@ -405,6 +405,10 @@ is requested. Keeping a reference in the ``nameidata`` ensures that only one root is in effect for the entire path walk, even if it races with a ``chroot()`` system call. +It should be noted that in the case of ``LOOKUP_IN_ROOT`` or +``LOOKUP_BENEATH``, the effective root becomes the directory file descriptor +passed to ``openat2()`` (which exposes these ``LOOKUP_`` flags). + The root is needed when either of two conditions holds: (1) either the pathname or a symbolic link starts with a "'/'", or (2) a "``..``" component is being handled, since "``..``" from the root must always stay
@@ -1149,7 +1153,7 @@ so ``NULL`` is returned to indicate that the symlink can be released and the stack frame discarded. The other case involves things in ``/proc`` that look like symlinks but -aren't really:: +aren't really (and are therefore commonly referred to as "magic-links"):: $ ls -l /proc/self/fd/1 lrwx------ 1 neilb neilb 64 Jun 13 10:19 /proc/self/fd/1 -> /dev/pts/4
@@ -1310,12 +1314,14 @@ longer needed. ``LOOKUP_JUMPED`` means that the current dentry was chosen not because it had the right name but for some other reason. This happens when following "``..``", following a symlink to ``/``, crossing a mount point -or accessing a "``/proc/$PID/fd/$FD``" symlink. In this case the -filesystem has not been asked to revalidate the name (with -``d_revalidate()``). In such cases the inode may still need to be -revalidated, so ``d_op->d_weak_revalidate()`` is called if +or accessing a "``/proc/$PID/fd/$FD``" symlink (also known as a "magic +link"). In this case the filesystem has not been asked to revalidate the +name (with ``d_revalidate()``). In such cases the inode may still need +to be revalidated, so ``d_op->d_weak_revalidate()`` is called if ``LOOKUP_JUMPED`` is set when the look completes - which may be at the -final component or, when creating, unlinking, or renaming, at the penultimate component. +final component or, when creating, unlinking, or renaming, at the +penultimate component. ``LOOKUP_MAGICLINK_JUMPED`` is set alongside +``LOOKUP_JUMPED`` if a magic-link was traversed. Final-component flags ~~~~~~~~~~~~~~~~~~~~~
Signature · 1 line
2.23.0
Quoted 408 lines · Aleksa Sarai
This patchset is being developed here:
<https://github.com/cyphar/linux/tree/openat2/master>Patch changelog:
v15:
* Fix code style forLOOKUP_IN_ROOThandling inpath_init(). [Linus Torvalds]
* Split out patches for each individual LOOKUP flag.
* Reword commit messages to give more background information about the series, as well as mention the semantics of each flag in more detail.
v14: <https://lore.kernel.org/lkml/[email protected]/><https://lore.kernel.org/lkml/[email protected]> v13: <https://lore.kernel.org/lkml/[email protected]/> v12: <https://lore.kernel.org/lkml/[email protected]/> v11: <https://lore.kernel.org/lkml/[email protected]/> <https://lore.kernel.org/lkml/[email protected]/>v10: <https://lore.kernel.org/lkml/[email protected]/>
v09: <https://lore.kernel.org/lkml/[email protected]/>
v08: <https://lore.kernel.org/lkml/[email protected]/>
v07: <https://lore.kernel.org/lkml/[email protected]/>
v06: <https://lore.kernel.org/lkml/[email protected]/>
v05: <https://lore.kernel.org/lkml/[email protected]/>
v04: <https://lore.kernel.org/lkml/[email protected]/>
v03: <https://lore.kernel.org/lkml/[email protected]/>
v02: <https://lore.kernel.org/lkml/[email protected]/>
v01: <https://lore.kernel.org/lkml/[email protected]/>For a very long time, extending openat(2) with new features has been incredibly frustrating. This stems from the fact that openat(2) is possibly the most famous counter-example to the mantra "don't silently accept garbage from userspace" -- it doesn't check whether unknown flags are present[1].
This means that (generally) the addition of new flags to openat(2) has been fraught with backwards-compatibility issues (
O_TMPFILEhas to be defined as __O_TMPFILE|O_DIRECTORY|[O_RDWR orO_WRONLY] to ensure old kernels gave errors, since it's insecure to silently ignore the flag[2]). All new security-related flags therefore have a tough road to being added to openat(2).Furthermore, the need for some sort of control over VFS's path resolution (to avoid malicious paths resulting in inadvertent breakouts) has been a very long-standing desire of many userspace applications. This patchset is a revival of Al Viro's old AT_NO_JUMPS[3] patchset (which was a variant of David Drysdale's
O_BENEATHpatchset[4] which was a spin-off of the Capsicum project[5]) with a few additions and changes made based on the previous discussion within [6] as well as others I felt were useful.In line with the conclusions of the original discussion of
AT_NO_JUMPS, the flag has been split up into separate flags. However, instead of being an openat(2) flag it is provided through a new syscall openat2(2) which provides several other improvements to the openat(2) interface (see the patch description for more details). The following new LOOKUP_* flags are added:*
LOOKUP_NO_XDEVblocks all mountpoint crossings (upwards, downwards, or through absolute links). Absolute pathnames alone in openat(2) do not trigger this. Magic-link traversal which implies a vfsmount jump is also blocked (though magic-link jumps on the same vfsmount are permitted).*
LOOKUP_NO_MAGICLINKSblocks resolution through/proc/$pid/fd-stylelinks. This is done by blocking the usage ofnd_jump_link()during resolution in a filesystem. The term "magic-links" is used to match with the only reference to these links inDocumentation/, but I'm happy to change the name.It should be noted that this is different to the scope of ~LOOKUP_FOLLOW in that it applies to all path components. However, you can do
openat2(NO_FOLLOW|NO_MAGICLINKS)on a magic-link and it will *not* fail (assuming that no parent component was a magic-link), and you will have an fd for the magic-link.In order to correctly detect magic-links, the introduction of a new
LOOKUP_MAGICLINK_JUMPEDstate flag was required.*
LOOKUP_BENEATHdisallows escapes to outside the starting dirfd's tree, using techniques such as ".." or absolute links. Absolute paths in openat(2) are also disallowed. Conceptually this flag is to ensure you "stay below" a certain point in the filesystem tree -- but this requires some additional to protect against various races that would allow escape using "..".Currently
LOOKUP_BENEATHimpliesLOOKUP_NO_MAGICLINKS, because it can trivially beam you around the filesystem (breaking the protection). In future, there might be similar safety checks done as inLOOKUP_IN_ROOT, but that requires more discussion.In addition, two new flags are added that expand on the above ideas:
*
LOOKUP_NO_SYMLINKSdoes what it says on the tin. No symlink resolution is allowed at all, including magic-links. Just as withLOOKUP_NO_MAGICLINKSthis can still be used with NOFOLLOW to open an fd for the symlink as long as no parent path had a symlink component.*
LOOKUP_IN_ROOTis an extension ofLOOKUP_BENEATHthat, rather than blocking attempts to move past the root, forces all such movements to be scoped to the starting point. This provides chroot(2)-like protection but without the cost of a chroot(2) for each filesystem operation, as well as being safe against race attacks that chroot(2) is not.If a race is detected (as with
LOOKUP_BENEATH) then an error is generated, and similar toLOOKUP_BENEATHit is not permitted to cross magic-links withLOOKUP_IN_ROOT.The primary need for this is from container runtimes, which currently need to do symlink scoping in userspace[7] when opening paths in a potentially malicious container. There is a long list of CVEs that could have bene mitigated by having
RESOLVE_THIS_ROOT(such as CVE-2017-1002101, CVE-2017-1002102, CVE-2018-15664, and CVE-2019-5736, just to name a few).In order to make all of the above more usable, I'm working on libpathrs[8] which is a C-friendly library for safe path resolution. It features a userspace-emulated backend if the kernel doesn't support openat2(2). Hopefully we can get userspace to switch to using it, and thus get openat2(2) support for free once it's ready.
Future work would include implementing things like
RESOLVE_NO_AUTOMOUNTand possibly aRESOLVE_NO_REMOTE(to allow programs to be sure they don't hit DoSes though stale NFS handles).[1]: https://lwn.net/Articles/588444/
[2]: https://lore.kernel.org/lkml/CA+55aFyyxJL1LyXZeBsf2ypriraj5ut1XkNDsunRBqgVjZU_6Q@mail.gmail.com
[3]: https://lore.kernel.org/lkml/[email protected]
[4]: https://lore.kernel.org/lkml/[email protected]
[5]: https://lore.kernel.org/lkml/[email protected]
[6]: https://lwn.net/Articles/723057/
[7]: https://github.com/cyphar/filepath-securejoin
[8]: https://github.com/openSUSE/libpathrsThe current draft of the openat2(2) man-page is included below.
--8<---------------------------------------------------------------------------
OPENAT2(2) Linux Programmer's Manual OPENAT2(2)NAME
openat2 - open and possibly create a file (extended)SYNOPSIS
#include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> int openat2(int dirfd, const char *pathname, struct open_how *how, size_t size); Note: There is no glibc wrapper for this system call; see NOTES.DESCRIPTION
Theopenat2()system call opens the file specified by pathname. If the specified file does not exist, it may optionally (ifO_CREATis specified in how.flags) be created byopenat2().As with openat(2), if pathname is relative, then it is interpreted relative to the direc- tory referred to by the file descriptor dirfd (or the current working directory of the calling process, if dirfd is the special value
AT_FDCWD.) If pathname is absolute, then dirfd is ignored (unless how.resolve containsRESOLVE_IN_ROOT, in which case pathname is resolved relative to dirfd.)The
openat2()system call is an extension of openat(2) and provides a superset of its functionality. Rather than taking a single flag argument, an extensible structure (how) is passed instead to allow for future extensions. size must be set tosizeof(struct open_how), to facilitate future extensions (see the "Extensibility" section of the NOTES for more detail on how extensions are handled.)The
open_howstructure
The following structure indicates how pathname should be opened, and acts as a superset of the flag and mode arguments to openat(2).struct
open_how{
__aligned_u64flags; /* O_* flags. */
__u16mode; /* Mode for O_{CREAT,TMPFILE}. */
__u16__padding[3]; /* Must be zeroed. */
__aligned_u64resolve; /* RESOLVE_* flags. */
};Any future extensions to
openat2()will be implemented as new fields appended to the above structure (or through reuse of pre-existing padding space), with the zero value of the new fields acting as though the extension were not present.The meaning of each field is as follows:
flags
The file creation and status flags to use for this operation. All of the
O_* flags defined for openat(2) are validopenat2()flag values.Unlike openat(2), it is an error to provide
openat2()unknown or conflicting flags in flags.mode
File mode for the new file, with identical semantics to the mode argument to
openat(2). However, unlike openat(2), it is an error to provideopenat2()
with a mode which contains bits other than 0777.It is an error to provide
openat2()a non-zero mode if flags does not con- tainO_CREATorO_TMPFILE.resolve
Change how the components of pathname will be resolved (see path_resolu- tion(7) for background information.) The primary use case for these flags is to allow trusted programs to restrict how untrusted paths (or paths in- side untrusted directories) are resolved. The full list of resolve flags is given below.
RESOLVE_NO_XDEV
Disallow traversal of mount points during path resolution (including all bind mounts).Users of this flag are encouraged to make its use configurable (un- less it is used for a specific security purpose), as bind mounts are very widely used by end-users. Setting this flag indiscrimnately for all uses of
openat2()may result in spurious errors on previously- functional systems.
RESOLVE_NO_SYMLINKS
Disallow resolution of symbolic links during path resolution. This
option impliesRESOLVE_NO_MAGICLINKS.If the trailing component is a symbolic link, and flags contains both
O_PATHandO_NOFOLLOW, then anO_PATHfile descriptor referencing the symbolic link will be returned.Users of this flag are encouraged to make its use configurable (un- less it is used for a specific security purpose), as symbolic links are very widely used by end-users. Setting this flag indiscrimnately for all uses of
openat2()may result in spurious errors on previ- ously-functional systems.
RESOLVE_NO_MAGICLINKS
Disallow all magic link resolution during path resolution.If the trailing component is a magic link, and flags contains both
O_PATHandO_NOFOLLOW, then anO_PATHfile descriptor referencing the magic link will be returned.Magic-links are symbolic link-like objects that are most notably
found in proc(5) (examples include /proc/[pid]/exe and
/proc/[pid]/fd/*.) Due to the potential danger of unknowingly open-
ing these magic links, it may be preferable for users to disable their resolution entirely (see symboliclink(7) for more details.)
RESOLVE_BENEATH
Do not permit the path resolution to succeed if any component of the resolution is not a descendant of the directory indicated by dirfd. This results in absolute symbolic links (and absolute values of path- name) to be rejected.Currently, this flag also disables magic link resolution. However,
this may change in the future. The caller should explicitly specifyRESOLVE_NO_MAGICLINKSto ensure that magic links are not resolved.
RESOLVE_IN_ROOT
Treat dirfd as the root directory while resolving pathname (as though the user called chroot(2) with dirfd as the argument.) Absolute sym-
bolic links and ".." path components will be scoped to dirfd. If
pathname is an absolute path, it is also treated relative to dirfd.However, unlike chroot(2) (which changes the filesystem root perma- nently for a process),
RESOLVE_IN_ROOTallows a program to effi- ciently restrict path resolution for only certain operations. It also has several hardening features (such detecting escape attempts during .. resolution) which chroot(2) does not.Currently, this flag also disables magic link resolution. However, this may change in the future. The caller should explicitly specify
RESOLVE_NO_MAGICLINKSto ensure that magic links are not resolved.It is an error to provide
openat2()unknown flags in resolve.RETURN VALUE
On success, a new file descriptor is returned. On error, -1 is returned, and errno is set appropriately.ERRORS
The set of errors returned byopenat2()includes all of the errors returned by openat(2), as well as the following additional errors:EINVAL An unknown flag or invalid value was specified in how.
EINVAL mode is non-zero, but flags does not contain
O_CREATorO_TMPFILE.EINVAL size was smaller than any known version of struct
open_how.E2BIG An extension was specified in how, which the current kernel does not support (see
the "Extensibility" section of the NOTES for more detail on how extensions are han- dled.)EAGAIN resolve contains either
RESOLVE_IN_ROOTorRESOLVE_BENEATH, and the kernel could
not ensure that a ".." component didn't escape (due to a race condition or poten- tial attack.) Callers may choose to retry theopenat2()call.EXDEV resolve contains either
RESOLVE_IN_ROOTorRESOLVE_BENEATH, and an escape from the
root during path resolution was detected.EXDEV resolve contains
RESOLVE_NO_XDEV, and a path component attempted to cross a mount
point.ELOOP resolve contains
RESOLVE_NO_SYMLINKS, and one of the path components was a symbolic
link (or magic link).ELOOP resolve contains
RESOLVE_NO_MAGICLINKS, and one of the path components was a magic
link.VERSIONS
openat2()was added to Linux in kernel 5.FOO.CONFORMING TO
This system call is Linux-specific.The semantics of
RESOLVE_BENEATHwere modelled after FreeBSD'sO_BENEATH.NOTES
Glibc does not provide a wrapper for this system call; call it using systemcall(2).Extensibility
In order to allow for structopen_howto be extended in future kernel revisions,openat2()
requires userspace to specify the size of structopen_howstructure they are passing. By
providing this information, it is possible foropenat2()to provide both forwards- and backwards-compatibility — with size acting as an implicit version number (because new ex- tension fields will always be appended, the size will always increase.) This extensibil-
ity design is very similar to other system calls such asperf_setattr(2),
perf_event_open(2), and clone(3).If we let usize be the size of the structure according to userspace and ksize be the size of the structure which the kernel supports, then there are only three cases to consider:
* If ksize equals usize, then there is no version mismatch and how can be used verbatim.
* If ksize is larger than usize, then there are some extensions the kernel sup- ports which the userspace program is unaware of. Because all extensions must have their zero values be a no-op, the kernel treats all of the extension fields not set by userspace to have zero values. This provides backwards-compatibil- ity.
* If ksize is smaller than usize, then there are some extensions which the userspace program is aware of but the kernel does not support. Because all ex- tensions must have their zero values be a no-op, the kernel can safely ignore the unsupported extension fields if they are all-zero. If any unsupported ex- tension fields are non-zero, then -1 is returned and errno is set to E2BIG. This provides forwards-compatibility.
Therefore, most userspace programs will not need to have any special handling of exten-
sions. However, if a userspace program wishes to determine what extensions the running
kernel supports, they may conduct a binary search on size (to find the largest value which doesn't produce an error of E2BIG.)SEE ALSO
openat(2), path_resolution(7), symlink(7)Linux 2019-11-05 OPENAT2(2)
--8<---------------------------------------------------------------------------Aleksa Sarai (9):
namei:LOOKUP_NO_SYMLINKS: block symlink resolution
namei:LOOKUP_NO_MAGICLINKS: block magic-link resolution
namei:LOOKUP_NO_XDEV: block mountpoint crossing
namei:LOOKUP_BENEATH: O_BENEATH-like scoped resolution
namei:LOOKUP_IN_ROOT: chroot-like scoped resolution
namei: LOOKUP_{IN_ROOT,BENEATH}: permit limited ".." resolution
open: introduce openat2(2) syscall
selftests: add openat2(2) selftests
Documentation: path-lookup: mentionLOOKUP_MAGICLINK_JUMPEDCREDITS | 4 +- Documentation/filesystems/path-lookup.rst | 18 +- arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 + arch/ia64/kernel/syscalls/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + fs/namei.c | 176 +++++- fs/open.c | 149 +++-- include/linux/fcntl.h | 12 +- include/linux/namei.h | 11 + include/linux/syscalls.h | 3 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/fcntl.h | 41 ++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/openat2/.gitignore | 1 + tools/testing/selftests/openat2/Makefile | 8 + tools/testing/selftests/openat2/helpers.c | 109 ++++ tools/testing/selftests/openat2/helpers.h | 107 ++++ .../testing/selftests/openat2/openat2_test.c | 316 +++++++++++ .../selftests/openat2/rename_attack_test.c | 160 ++++++ .../testing/selftests/openat2/resolve_test.c | 523 ++++++++++++++++++ 35 files changed, 1591 insertions(+), 73 deletions(-) create mode 100644 tools/testing/selftests/openat2/.gitignore create mode 100644 tools/testing/selftests/openat2/Makefile create mode 100644 tools/testing/selftests/openat2/helpers.c create mode 100644 tools/testing/selftests/openat2/helpers.h create mode 100644 tools/testing/selftests/openat2/openat2_test.c create mode 100644 tools/testing/selftests/openat2/rename_attack_test.c create mode 100644 tools/testing/selftests/openat2/resolve_test.c
Quoted 1 line
base-commit:
a99d8080aaf358d5d23581244e5da23b35e340b9
Ping -- this patch hasn't been touched for a week. Thanks.
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
Quoted 12 lines · Aleksa Sarai
Quoted 10 lines · Aleksa Sarai
This patchset is being developed here:
<https://github.com/cyphar/linux/tree/openat2/master>Patch changelog:
v15:
* Fix code style forLOOKUP_IN_ROOThandling inpath_init(). [Linus Torvalds]
* Split out patches for each individual LOOKUP flag.
* Reword commit messages to give more background information about the series, as well as mention the semantics of each flag in more detail.
[...]
Quoted 1 line
Ping -- this patch hasn't been touched for a week. Thanks.
If I've been following correctly, everyone is happy with this series. (i.e. Linus's comment appear to have been addressed.)
Perhaps the next question is should this go via a pull request by you to Linus directly during the v5.5 merge window, via akpm, via akpm, via Christian, or some other path? Besides Linus, it's not been clear who should "claim" this series. :)
Signature · 1 line
Kees Cook
Quoted 15 lines · Kees Cook
Quoted 12 lines · Aleksa Sarai
Quoted 10 lines · Aleksa Sarai
This patchset is being developed here:
<https://github.com/cyphar/linux/tree/openat2/master>Patch changelog:
v15:
* Fix code style forLOOKUP_IN_ROOThandling inpath_init(). [Linus Torvalds]
* Split out patches for each individual LOOKUP flag.
* Reword commit messages to give more background information about the series, as well as mention the semantics of each flag in more detail.
[...]Quoted 1 line
Ping -- this patch hasn't been touched for a week. Thanks.
Quoted 7 lines
If I've been following correctly, everyone is happy with this series. (i.e. Linus's comment appear to have been addressed.)
Perhaps the next question is should this go via a pull request by you to Linus directly during the v5.5 merge window, via akpm, via akpm, via Christian, or some other path? Besides Linus, it's not been clear who should "claim" this series. :)
I like this series and the same with the copy_struct_from_user() part of it I've taken I'm happy to stuff this into a dedicated branch, merge it into my for-next and send it for v5.5.
Though I'd _much_ rather see Al pick this up or have him give his blessing first.
Christian
Quoted 15 lines · Kees Cook
Quoted 12 lines · Aleksa Sarai
Quoted 10 lines · Aleksa Sarai
This patchset is being developed here:
<https://github.com/cyphar/linux/tree/openat2/master>Patch changelog:
v15:
* Fix code style forLOOKUP_IN_ROOThandling inpath_init(). [Linus Torvalds]
* Split out patches for each individual LOOKUP flag.
* Reword commit messages to give more background information about the series, as well as mention the semantics of each flag in more detail.
[...]Quoted 1 line
Ping -- this patch hasn't been touched for a week. Thanks.
Quoted 7 lines
If I've been following correctly, everyone is happy with this series. (i.e. Linus's comment appear to have been addressed.)
Perhaps the next question is should this go via a pull request by you to Linus directly during the v5.5 merge window, via akpm, via akpm, via Christian, or some other path? Besides Linus, it's not been clear who should "claim" this series. :)
Given the namei changes, I wanted to avoid stepping on Al's toes. Though he did review the series a few versions ago, the discussion didn't focus on the openat2(2) semantics (which have also changed since then). I'm not sure whether to interpret the silence to mean he's satisfied with things as they are, or if he hasn't had more time to look at the series.
As for which tree it should be routed to, I don't mind -- Christian is the most straight-forward choice (but if Al wants to route it, that's fine with me too).
Signature · 4 lines
Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>