redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

userns: Convert usb functionfs to use kuid/kgid where appropriate

Browse source 
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2012-06-14 01:19:23 -07:00
parent 32d639c66e
commit b9b73f7c4d
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/usb/gadget/f_fs.c
View file

@ -220,8 +220,8 @@ struct ffs_data {
/* File permissions, written once when fs is mounted */ /* File permissions, written once when fs is mounted */
struct ffs_file_perms { struct ffs_file_perms {
umode_t mode; umode_t mode;
uid_t uid; kuid_t uid;
gid_t gid; kgid_t gid;
} file_perms; } file_perms;
/* /*
@ -1143,10 +1143,19 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts)
break; break;
case 3: case 3:
if (!memcmp(opts, "uid", 3)) if (!memcmp(opts, "uid", 3)) {
data->perms.uid = value; data->perms.uid = make_kuid(current_user_ns(), value);
if (!uid_valid(data->perms.uid)) {
pr_err("%s: unmapped value: %lu\n", opts, value);
return -EINVAL;
}
}
else if (!memcmp(opts, "gid", 3)) else if (!memcmp(opts, "gid", 3))
data->perms.gid = value; data->perms.gid = make_kgid(current_user_ns(), value);
if (!gid_valid(data->perms.gid)) {
pr_err("%s: unmapped value: %lu\n", opts, value);
return -EINVAL;
}
else else
goto invalid; goto invalid;
break; break;
@ -1175,8 +1184,8 @@ ffs_fs_mount(struct file_system_type *t, int flags,
struct ffs_sb_fill_data data = { struct ffs_sb_fill_data data = {
.perms = { .perms = {
.mode = S_IFREG | 0600, .mode = S_IFREG | 0600,
.uid = 0, .uid = GLOBAL_ROOT_UID,
.gid = 0 .gid = GLOBAL_ROOT_GID,
}, },
.root_mode = S_IFDIR | 0500, .root_mode = S_IFDIR | 0500,
}; };

1
init/Kconfig
View file

@ -932,7 +932,6 @@ config UIDGID_CONVERTED
depends on NET_9P = n depends on NET_9P = n
# Filesystems # Filesystems
depends on USB_FUNCTIONFS = n
depends on DEVTMPFS = n depends on DEVTMPFS = n
depends on XENFS = n depends on XENFS = n