diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-08-25 16:07:42 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-08-25 16:07:42 -0700 |
| commit | 880b0dd94f0399cf772a8582e7b5a47f180c8618 (patch) | |
| tree | f85d11673c4ed5c6d28863f5241260483d52433f /fs/namespace.c | |
| parent | b9030780971b56c0c455c3b66244efd96608846d (diff) | |
| parent | 4c612826bec1441214816827979b62f84a097e91 (diff) | |
| download | linux-stable-880b0dd94f0399cf772a8582e7b5a47f180c8618.tar.gz linux-stable-880b0dd94f0399cf772a8582e7b5a47f180c8618.tar.bz2 linux-stable-880b0dd94f0399cf772a8582e7b5a47f180c8618.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
21234e3a84c7 ("net/mlx5e: Fix use after free in mlx5e_fs_init()")
c7eafc5ed068 ("net/mlx5e: Convert ethtool_steering member of flow_steering struct to pointer")
https://lore.kernel.org/all/20220825104410.67d4709c@canb.auug.org.au/
https://lore.kernel.org/all/20220823055533.334471-1-saeed@kernel.org/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 68789f896f08..df137ba19d37 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -4238,6 +4238,13 @@ static int build_mount_idmapped(const struct mount_attr *attr, size_t usize, err = -EPERM; goto out_fput; } + + /* We're not controlling the target namespace. */ + if (!ns_capable(mnt_userns, CAP_SYS_ADMIN)) { + err = -EPERM; + goto out_fput; + } + kattr->mnt_userns = get_user_ns(mnt_userns); out_fput: |