Re: [PATCH] usb: gadget: FunctionFS: Fix missing braces in parse_opts

[Michal Nazarewicz <mina86@mina86.com>]

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

On Wed, Jan 09 2013, Benoit Goby <benoit@android.com> wrote:
> 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 <benoit@android.com>

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: stable@kernel.org

> ---
>  drivers/usb/gadget/f_fs.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
> index 4a6961c..8c2f251 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:

-- 
Best regards,                                         _     _
.o. | Liege of Serenely Enlightened Majesty of      o' \,=./ `o
..o | Computer Science,  Michał “mina86” Nazarewicz    (o o)
ooo +----<email/xmpp: mpn@google.com>--------------ooO--(_)--Ooo--

[-- Attachment #2.1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2.2: Type: application/pgp-signature, Size: 835 bytes --]