summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2013-01-08 19:57:09 -0800
committerFelipe Balbi <balbi@ti.com>2013-01-18 14:11:11 +0200
commitb810075002c9f25a6da83cecda39d789000a04a9 (patch)
treefd5915a041c532ec0d2f9ab8da84cc071fa95460 /drivers/usb
parent6048e4c69d80600baba35856651056860d5d8f5a (diff)
downloadlinux-3.10-b810075002c9f25a6da83cecda39d789000a04a9.tar.gz
linux-3.10-b810075002c9f25a6da83cecda39d789000a04a9.tar.bz2
linux-3.10-b810075002c9f25a6da83cecda39d789000a04a9.zip
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/f_fs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 4a6961c517f..8c2f2512114 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -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);
return -EINVAL;
}
- }
- else if (!memcmp(opts, "gid", 3))
+ } else if (!memcmp(opts, "gid", 3)) {
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;
+ }
break;
default: