mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v1] usb: gadget: autostart: properly release f_multi_opts
Date: Wed, 6 Sep 2017 15:43:15 +0200	[thread overview]
Message-ID: <20170906134315.i4udwav23puir6py@pengutronix.de> (raw)
In-Reply-To: <20170726155014.20014-1-o.rempel@pengutronix.de>

On Wed, Jul 26, 2017 at 05:50:14PM +0200, Oleksij Rempel wrote:
> the same as for usb gadget autostarter.
> 
> |commit 2b9bcff79a02f770fa730e2689ba35cc03c0da7d
> |Author: Sascha Hauer <s.hauer@pengutronix.de>
> |Date:   Fri Jan 20 10:03:45 2017 +0100
> |
> |    usb: gadget: properly release f_multi_opts
> |
> |    The usbgadget commands uses statically allocated f_multi_opts and passes
> |    this to usb_multi_register(). These f_multi_opts are of course no
> |    longer valid when we leave the usbgadget command. Luckily we do not use
> |    the data after we left the usbgadget command, so this never has been a
> |    problem. However, f_multi_opts has some allocated members which we can
> |    not free anymore on gadget unregistration because we no longer have the
> |    pointer to them.
> |
> |    Fix this by adding a release function to struct f_multi_opts. This way
> |    we can allocate all memory dynamically and properly free it when not
> |    used anymore.
> |
> |    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  drivers/usb/gadget/autostart.c | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/usb/gadget/autostart.c b/drivers/usb/gadget/autostart.c
> index 4ad1dd6be1..465d8fd380 100644
> --- a/drivers/usb/gadget/autostart.c
> +++ b/drivers/usb/gadget/autostart.c
> @@ -31,19 +31,28 @@ static char *fastboot_function;
>  
>  static int usbgadget_autostart(void)
>  {
> -	struct f_multi_opts opts = {};
> +	struct f_multi_opts *opts;
> +	int ret;
>  
>  	if (!autostart)
>  		return 0;
>  
>  	setenv("otg.mode", "peripheral");
>  
> +	opts = xzalloc(sizeof(*opts));
> +	opts->release = usb_multi_opts_release;
> +
>  	if (fastboot_function)
> -		opts.fastboot_opts.files = file_list_parse(fastboot_function);
> +		opts->fastboot_opts.files = file_list_parse(fastboot_function);
> +
> +	opts->create_acm = acm;
> +
>  
> -	opts.create_acm = acm;
> +	ret = usb_multi_register(opts);
> +	if (ret)
> +		usb_multi_opts_release(opts);
>  
> -	return usb_multi_register(&opts);
> +	return ret;
>  }
>  postenvironment_initcall(usbgadget_autostart);
>  
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2017-09-06 13:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-26 15:50 Oleksij Rempel
2017-09-06 13:43 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170906134315.i4udwav23puir6py@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=o.rempel@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox