hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: FunctionFS: Fix missing braces in parse_opts 

Add missing braces around an if block in ffs_fs_parse_opts. This broke
parsing the uid/gid mount options and causes mount to fail when using
uid/gid. This has been introduced by commit b9b73f7c (userns: Convert usb
functionfs to use kuid/kgid where appropriate) in 3.7.

Cc: <stable@vger.kernel.org>
Signed-off-by: Benoit Goby <benoit@android.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Benoit Goby 2013-01-08 19:57:09 -08:00 committed by Felipe Balbi
parent 6048e4c69d
commit b810075002
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/f_fs.c
View File

@ -1153,15 +1153,15 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts)
pr_err("%s: unmapped value: %lu\n", opts, value); pr_err("%s: unmapped value: %lu\n", opts, value);
return -EINVAL; return -EINVAL;
} }
} } else if (!memcmp(opts, "gid", 3)) {
else if (!memcmp(opts, "gid", 3))
data->perms.gid = make_kgid(current_user_ns(), value); data->perms.gid = make_kgid(current_user_ns(), value);
if (!gid_valid(data->perms.gid)) { if (!gid_valid(data->perms.gid)) {
pr_err("%s: unmapped value: %lu\n", opts, value); pr_err("%s: unmapped value: %lu\n", opts, value);
return -EINVAL; return -EINVAL;
} }
else } else {
goto invalid; goto invalid;
}
break; break;
default: default: