[U-Boot,v5,1/1] usb: gadget: avoid variable name clipping in cb_getvar

Submitted by Nicolas le bayon on March 17, 2017, 9:57 a.m.

Details

Message ID CAJZhe_jYH+1215ufzYL+EwOQ50DKorZ1UYCAofF26hSKmHeW-Q@mail.gmail.com
State Superseded
Delegated to: Ɓukasz Majewski
Headers show

Commit Message

Nicolas le bayon March 17, 2017, 9:57 a.m.
From: Nicolas Le Bayon <nlebayon@gmail.com>

Instead of using a fixed-size array to store variable name, preferring a
dynamic allocation treats correctly all variable name lengths.
Variable names are growing through releases and features. By this way, name
clipping is prevented.

Signed-off-by: Nicolas Le Bayon <nlebayon@gmail.com>
---
 drivers/usb/gadget/f_fastboot.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

                        strncat(response, s, chars_left);
@@ -442,6 +448,8 @@ static void cb_getvar(struct usb_ep *ep, struct
usb_request *req)
                        printf("WARNING: unknown variable: %s\n", cmd);
                        strcpy(response, "FAILVariable not implemented");
                }
+
+               free(envstr);
        }
        fastboot_tx_write_str(response);
 }
--
1.9.1

Comments

Marek Vasut March 17, 2017, 12:26 p.m.
On 03/17/2017 10:57 AM, Nicolas le bayon wrote:
> From: Nicolas Le Bayon <nlebayon@gmail.com>
> 
> Instead of using a fixed-size array to store variable name, preferring a
> dynamic allocation treats correctly all variable name lengths.
> Variable names are growing through releases and features. By this way, name
> clipping is prevented.
> 
> Signed-off-by: Nicolas Le Bayon <nlebayon@gmail.com>

FYI, you should keep changelog on patchsets > V1 .

Reviewed-by: Marek Vasut <marex@denx.de>

You still need Ack from Lukasz ...

> ---
>  drivers/usb/gadget/f_fastboot.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_
> fastboot.c
> index 2160b1c..7cd6d24 100644
> --- a/drivers/usb/gadget/f_fastboot.c
> +++ b/drivers/usb/gadget/f_fastboot.c
> @@ -432,9 +432,15 @@ static void cb_getvar(struct usb_ep *ep, struct
> usb_request *req)
>                 else
>                         strcpy(response, "FAILValue not set");
>         } else {
> -               char envstr[32];
> +               char *envstr;
> 
> -               snprintf(envstr, sizeof(envstr) - 1, "fastboot.%s", cmd);
> +               envstr = malloc(strlen("fastboot.") + strlen(cmd) + 1);
> +               if (!envstr) {
> +                       fastboot_tx_write_str("FAILmalloc error");
> +                       return;
> +               }
> +
> +               sprintf(envstr, "fastboot.%s", cmd);
>                 s = getenv(envstr);
>                 if (s) {
>                         strncat(response, s, chars_left);
> @@ -442,6 +448,8 @@ static void cb_getvar(struct usb_ep *ep, struct
> usb_request *req)
>                         printf("WARNING: unknown variable: %s\n", cmd);
>                         strcpy(response, "FAILVariable not implemented");
>                 }
> +
> +               free(envstr);
>         }
>         fastboot_tx_write_str(response);
>  }
> --
> 1.9.1
>
Nicolas le bayon March 21, 2017, 8:53 a.m.
Hi Lukasz,

Would it be possible to have a look at this patch and review it please?

Thanks in advance for your time

Best Regards
Nicolas

2017-03-17 13:26 GMT+01:00 Marek Vasut <marex@denx.de>:

> On 03/17/2017 10:57 AM, Nicolas le bayon wrote:
> > From: Nicolas Le Bayon <nlebayon@gmail.com>
> >
> > Instead of using a fixed-size array to store variable name, preferring a
> > dynamic allocation treats correctly all variable name lengths.
> > Variable names are growing through releases and features. By this way,
> name
> > clipping is prevented.
> >
> > Signed-off-by: Nicolas Le Bayon <nlebayon@gmail.com>
>
> FYI, you should keep changelog on patchsets > V1 .
>
> Reviewed-by: Marek Vasut <marex@denx.de>
>
> You still need Ack from Lukasz ...
>
> > ---
> >  drivers/usb/gadget/f_fastboot.c | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_
> > fastboot.c
> > index 2160b1c..7cd6d24 100644
> > --- a/drivers/usb/gadget/f_fastboot.c
> > +++ b/drivers/usb/gadget/f_fastboot.c
> > @@ -432,9 +432,15 @@ static void cb_getvar(struct usb_ep *ep, struct
> > usb_request *req)
> >                 else
> >                         strcpy(response, "FAILValue not set");
> >         } else {
> > -               char envstr[32];
> > +               char *envstr;
> >
> > -               snprintf(envstr, sizeof(envstr) - 1, "fastboot.%s", cmd);
> > +               envstr = malloc(strlen("fastboot.") + strlen(cmd) + 1);
> > +               if (!envstr) {
> > +                       fastboot_tx_write_str("FAILmalloc error");
> > +                       return;
> > +               }
> > +
> > +               sprintf(envstr, "fastboot.%s", cmd);
> >                 s = getenv(envstr);
> >                 if (s) {
> >                         strncat(response, s, chars_left);
> > @@ -442,6 +448,8 @@ static void cb_getvar(struct usb_ep *ep, struct
> > usb_request *req)
> >                         printf("WARNING: unknown variable: %s\n", cmd);
> >                         strcpy(response, "FAILVariable not implemented");
> >                 }
> > +
> > +               free(envstr);
> >         }
> >         fastboot_tx_write_str(response);
> >  }
> > --
> > 1.9.1
> >
>
>
> --
> Best regards,
> Marek Vasut
>
Nicolas le bayon March 28, 2017, 9:10 a.m.
Hi Lukasz,

A kind reminder to look at this patch (already reviewed by Marek).

Thanks in advance for your time

Best Regards
Nicolas

2017-03-21 9:53 GMT+01:00 Nicolas le bayon <nlebayon@gmail.com>:

> Hi Lukasz,
>
> Would it be possible to have a look at this patch and review it please?
>
> Thanks in advance for your time
>
> Best Regards
> Nicolas
>
>
> 2017-03-17 13:26 GMT+01:00 Marek Vasut <marex@denx.de>:
>
>> On 03/17/2017 10:57 AM, Nicolas le bayon wrote:
>> > From: Nicolas Le Bayon <nlebayon@gmail.com>
>> >
>> > Instead of using a fixed-size array to store variable name, preferring a
>> > dynamic allocation treats correctly all variable name lengths.
>> > Variable names are growing through releases and features. By this way,
>> name
>> > clipping is prevented.
>> >
>> > Signed-off-by: Nicolas Le Bayon <nlebayon@gmail.com>
>>
>> FYI, you should keep changelog on patchsets > V1 .
>>
>> Reviewed-by: Marek Vasut <marex@denx.de>
>>
>> You still need Ack from Lukasz ...
>>
>> > ---
>> >  drivers/usb/gadget/f_fastboot.c | 12 ++++++++++--
>> >  1 file changed, 10 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_
>> > fastboot.c
>> > index 2160b1c..7cd6d24 100644
>> > --- a/drivers/usb/gadget/f_fastboot.c
>> > +++ b/drivers/usb/gadget/f_fastboot.c
>> > @@ -432,9 +432,15 @@ static void cb_getvar(struct usb_ep *ep, struct
>> > usb_request *req)
>> >                 else
>> >                         strcpy(response, "FAILValue not set");
>> >         } else {
>> > -               char envstr[32];
>> > +               char *envstr;
>> >
>> > -               snprintf(envstr, sizeof(envstr) - 1, "fastboot.%s",
>> cmd);
>> > +               envstr = malloc(strlen("fastboot.") + strlen(cmd) + 1);
>> > +               if (!envstr) {
>> > +                       fastboot_tx_write_str("FAILmalloc error");
>> > +                       return;
>> > +               }
>> > +
>> > +               sprintf(envstr, "fastboot.%s", cmd);
>> >                 s = getenv(envstr);
>> >                 if (s) {
>> >                         strncat(response, s, chars_left);
>> > @@ -442,6 +448,8 @@ static void cb_getvar(struct usb_ep *ep, struct
>> > usb_request *req)
>> >                         printf("WARNING: unknown variable: %s\n", cmd);
>> >                         strcpy(response, "FAILVariable not
>> implemented");
>> >                 }
>> > +
>> > +               free(envstr);
>> >         }
>> >         fastboot_tx_write_str(response);
>> >  }
>> > --
>> > 1.9.1
>> >
>>
>>
>> --
>> Best regards,
>> Marek Vasut
>>
>
>

Patch hide | download patch | download mbox

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_
fastboot.c
index 2160b1c..7cd6d24 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -432,9 +432,15 @@  static void cb_getvar(struct usb_ep *ep, struct
usb_request *req)
                else
                        strcpy(response, "FAILValue not set");
        } else {
-               char envstr[32];
+               char *envstr;

-               snprintf(envstr, sizeof(envstr) - 1, "fastboot.%s", cmd);
+               envstr = malloc(strlen("fastboot.") + strlen(cmd) + 1);
+               if (!envstr) {
+                       fastboot_tx_write_str("FAILmalloc error");
+                       return;
+               }
+
+               sprintf(envstr, "fastboot.%s", cmd);
                s = getenv(envstr);
                if (s) {