This is a note to let you know that I've just added the patch titled
usb: gadget: FunctionFS: Fix missing braces in parse_opts
to the 3.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-gadget-functionfs-fix-missing-braces-in-parse_opts.patch
and it can be found in the queue-3.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From b810075002c9f25a6da83cecda39d789000a04a9 Mon Sep 17 00:00:00 2001
From: Benoit Goby <[email protected]>
Date: Tue, 8 Jan 2013 19:57:09 -0800
Subject: usb: gadget: FunctionFS: Fix missing braces in parse_opts
From: Benoit Goby <[email protected]>
commit b810075002c9f25a6da83cecda39d789000a04a9 upstream.
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.
Signed-off-by: Benoit Goby <[email protected]>
Acked-by: Michal Nazarewicz <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/gadget/f_fs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- 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_
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:
Patches currently in stable-queue which might be from [email protected] are
queue-3.7/usb-gadget-functionfs-fix-missing-braces-in-parse_opts.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
