[PATCH v2] USB: gadget: f_fs: fix error handling

[PATCH v2] USB: gadget: f_fs: fix error handling

[Robert Baldyga]

Hello,

This is update for my patch fixing error handling in functionfs module.
I have fixed typos from previous version, and changed description for greater
clearity as Sergei Shtylyov suggested.

This patch add missing error check in ffs_func_bind() function, after
ffs_do_descs() function call for high speed descriptors. Without this check
it's possible that the module will try to dereference incorrect pointer.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>

Changelog:

v2:
- fix typos
- expand patch desctiprion

v1: https://lkml.org/lkml/2013/9/27/128
---
 drivers/usb/gadget/f_fs.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 1a66c5b..0da66ba 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -2264,6 +2264,8 @@ static int ffs_func_bind(struct usb_configuration *c,
 				   data->raw_descs + ret,
 				   (sizeof data->raw_descs) - ret,
 				   __ffs_func_bind_do_descs, func);
+		if (unlikely(ret < 0))
+			goto error;
 	}
 
 	/*
-- 
1.7.9.5

Re: [PATCH v2] USB: gadget: f_fs: fix error handling

[Michal Nazarewicz]

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

On Mon, Sep 30 2013, Robert Baldyga wrote:
> Hello,
>
> This is update for my patch fixing error handling in functionfs module.
> I have fixed typos from previous version, and changed description for greater
> clearity as Sergei Shtylyov suggested.
>
> This patch add missing error check in ffs_func_bind() function, after
> ffs_do_descs() function call for high speed descriptors. Without this check
> it's possible that the module will try to dereference incorrect pointer.
>
> Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>

Acked-by: Michal Nazarewicz <mina86@mina86.com>

> Changelog:
>
> v2:
> - fix typos
> - expand patch desctiprion
>
> v1: https://lkml.org/lkml/2013/9/27/128
> ---

Note that it's helpful for maintainers to include everything that is not
meant to go in the commit message after those three minus signs.  This
way, “git am” will ignore the text.

>  drivers/usb/gadget/f_fs.c |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
> index 1a66c5b..0da66ba 100644
> --- a/drivers/usb/gadget/f_fs.c
> +++ b/drivers/usb/gadget/f_fs.c
> @@ -2264,6 +2264,8 @@ static int ffs_func_bind(struct usb_configuration *c,
>  				   data->raw_descs + ret,
>  				   (sizeof data->raw_descs) - ret,
>  				   __ffs_func_bind_do_descs, func);
> +		if (unlikely(ret < 0))
> +			goto error;
>  	}
>  
>  	/*
> -- 
> 1.7.9.5
>

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

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



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

Re: [PATCH v2] USB: gadget: f_fs: fix error handling

[Felipe Balbi]

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

Hi,

On Mon, Sep 30, 2013 at 01:50:25PM +0200, Michal Nazarewicz wrote:
> On Mon, Sep 30 2013, Robert Baldyga wrote:
> > Hello,
> >
> > This is update for my patch fixing error handling in functionfs module.
> > I have fixed typos from previous version, and changed description for greater
> > clearity as Sergei Shtylyov suggested.
> >
> > This patch add missing error check in ffs_func_bind() function, after
> > ffs_do_descs() function call for high speed descriptors. Without this check
> > it's possible that the module will try to dereference incorrect pointer.
> >
> > Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
> 
> Acked-by: Michal Nazarewicz <mina86@mina86.com>
> 
> > Changelog:
> >
> > v2:
> > - fix typos
> > - expand patch desctiprion
> >
> > v1: https://lkml.org/lkml/2013/9/27/128
> > ---
> 
> Note that it's helpful for maintainers to include everything that is not
> meant to go in the commit message after those three minus signs.  This
> way, “git am” will ignore the text.

right, please resend so I don't have to manually edit. Also, while doing
that, add Michal's Acked-by to the patch.

thanks

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]