diff mbox series

[U-Boot] net: fix env flags for eth10addr and above

Message ID 20181122160639.4586-1-simon.k.r.goldschmidt@gmail.com
State Accepted
Commit be09f5bc7c0c3f0d0bc7b88d23dae883bfa4e014
Delegated to: Joe Hershberger
Headers show
Series [U-Boot] net: fix env flags for eth10addr and above | expand

Commit Message

Simon Goldschmidt Nov. 22, 2018, 4:06 p.m. UTC
With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
interfaces (0..9) as the number can only have one digit.

On boards with more than 10 interfaces, this leads to the protection
and format checks being absent for eth10addr and above.

Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
more than one digit.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---

 include/env_flags.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Goldschmidt Dec. 9, 2018, 8:51 p.m. UTC | #1
Am 22.11.2018 um 17:06 schrieb Simon Goldschmidt:
> With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
> interfaces (0..9) as the number can only have one digit.
> 
> On boards with more than 10 interfaces, this leads to the protection
> and format checks being absent for eth10addr and above.
> 
> Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
> more than one digit.
> 
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
> 
>   include/env_flags.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/env_flags.h b/include/env_flags.h
> index cc2c34f939..23744e395c 100644
> --- a/include/env_flags.h
> +++ b/include/env_flags.h
> @@ -38,7 +38,7 @@ enum env_flags_varaccess {
>   
>   #ifdef CONFIG_CMD_NET
>   #ifdef CONFIG_REGEX
> -#define ETHADDR_WILDCARD "\\d?"
> +#define ETHADDR_WILDCARD "\\d*"
>   #else
>   #define ETHADDR_WILDCARD
>   #endif
> 

Ping?
Simon Goldschmidt Dec. 14, 2018, 8:56 a.m. UTC | #2
+Tom

On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
<simon.k.r.goldschmidt@gmail.com> wrote:
>
> Am 22.11.2018 um 17:06 schrieb Simon Goldschmidt:
> > With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
> > interfaces (0..9) as the number can only have one digit.
> >
> > On boards with more than 10 interfaces, this leads to the protection
> > and format checks being absent for eth10addr and above.
> >
> > Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
> > more than one digit.
> >
> > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > ---
> >
> >   include/env_flags.h | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/env_flags.h b/include/env_flags.h
> > index cc2c34f939..23744e395c 100644
> > --- a/include/env_flags.h
> > +++ b/include/env_flags.h
> > @@ -38,7 +38,7 @@ enum env_flags_varaccess {
> >
> >   #ifdef CONFIG_CMD_NET
> >   #ifdef CONFIG_REGEX
> > -#define ETHADDR_WILDCARD "\\d?"
> > +#define ETHADDR_WILDCARD "\\d*"
> >   #else
> >   #define ETHADDR_WILDCARD
> >   #endif
> >
>
> Ping?

I haven't gotten an answer to this for nearly one month. It's a small
change, can this go in for v2019.01 please?

Regards,
Simon
Tom Rini Dec. 14, 2018, 1:28 p.m. UTC | #3
On Fri, Dec 14, 2018 at 09:56:19AM +0100, Simon Goldschmidt wrote:

> +Tom
> 
> On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
> <simon.k.r.goldschmidt@gmail.com> wrote:
> >
> > Am 22.11.2018 um 17:06 schrieb Simon Goldschmidt:
> > > With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
> > > interfaces (0..9) as the number can only have one digit.
> > >
> > > On boards with more than 10 interfaces, this leads to the protection
> > > and format checks being absent for eth10addr and above.
> > >
> > > Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
> > > more than one digit.
> > >
> > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > > ---
> > >
> > >   include/env_flags.h | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/include/env_flags.h b/include/env_flags.h
> > > index cc2c34f939..23744e395c 100644
> > > --- a/include/env_flags.h
> > > +++ b/include/env_flags.h
> > > @@ -38,7 +38,7 @@ enum env_flags_varaccess {
> > >
> > >   #ifdef CONFIG_CMD_NET
> > >   #ifdef CONFIG_REGEX
> > > -#define ETHADDR_WILDCARD "\\d?"
> > > +#define ETHADDR_WILDCARD "\\d*"
> > >   #else
> > >   #define ETHADDR_WILDCARD
> > >   #endif
> > >
> >
> > Ping?
> 
> I haven't gotten an answer to this for nearly one month. It's a small
> change, can this go in for v2019.01 please?

I'd filed this off to Joe to grab since it is indeed small and a
clean-up.
Simon Goldschmidt Jan. 14, 2019, 3:42 p.m. UTC | #4
Am 14.12.2018 um 14:28 schrieb Tom Rini:
> On Fri, Dec 14, 2018 at 09:56:19AM +0100, Simon Goldschmidt wrote:
> 
>> +Tom
>>
>> On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
>> <simon.k.r.goldschmidt@gmail.com> wrote:
>>>
>>> Am 22.11.2018 um 17:06 schrieb Simon Goldschmidt:
>>>> With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
>>>> interfaces (0..9) as the number can only have one digit.
>>>>
>>>> On boards with more than 10 interfaces, this leads to the protection
>>>> and format checks being absent for eth10addr and above.
>>>>
>>>> Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
>>>> more than one digit.
>>>>
>>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
>>>> ---
>>>>
>>>>    include/env_flags.h | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/include/env_flags.h b/include/env_flags.h
>>>> index cc2c34f939..23744e395c 100644
>>>> --- a/include/env_flags.h
>>>> +++ b/include/env_flags.h
>>>> @@ -38,7 +38,7 @@ enum env_flags_varaccess {
>>>>
>>>>    #ifdef CONFIG_CMD_NET
>>>>    #ifdef CONFIG_REGEX
>>>> -#define ETHADDR_WILDCARD "\\d?"
>>>> +#define ETHADDR_WILDCARD "\\d*"
>>>>    #else
>>>>    #define ETHADDR_WILDCARD
>>>>    #endif
>>>>
>>>
>>> Ping?
>>
>> I haven't gotten an answer to this for nearly one month. It's a small
>> change, can this go in for v2019.01 please?
> 
> I'd filed this off to Joe to grab since it is indeed small and a
> clean-up.

Will you be taking this after the release or is there anything missing? 
It's assigned to you in patchwork but I didn't get any real reply...

Regards,
Simon
Tom Rini Jan. 14, 2019, 4:28 p.m. UTC | #5
On Mon, Jan 14, 2019 at 04:42:10PM +0100, Simon Goldschmidt wrote:
> Am 14.12.2018 um 14:28 schrieb Tom Rini:
> >On Fri, Dec 14, 2018 at 09:56:19AM +0100, Simon Goldschmidt wrote:
> >
> >>+Tom
> >>
> >>On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
> >><simon.k.r.goldschmidt@gmail.com> wrote:
> >>>
> >>>Am 22.11.2018 um 17:06 schrieb Simon Goldschmidt:
> >>>>With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
> >>>>interfaces (0..9) as the number can only have one digit.
> >>>>
> >>>>On boards with more than 10 interfaces, this leads to the protection
> >>>>and format checks being absent for eth10addr and above.
> >>>>
> >>>>Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
> >>>>more than one digit.
> >>>>
> >>>>Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> >>>>---
> >>>>
> >>>>   include/env_flags.h | 2 +-
> >>>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>
> >>>>diff --git a/include/env_flags.h b/include/env_flags.h
> >>>>index cc2c34f939..23744e395c 100644
> >>>>--- a/include/env_flags.h
> >>>>+++ b/include/env_flags.h
> >>>>@@ -38,7 +38,7 @@ enum env_flags_varaccess {
> >>>>
> >>>>   #ifdef CONFIG_CMD_NET
> >>>>   #ifdef CONFIG_REGEX
> >>>>-#define ETHADDR_WILDCARD "\\d?"
> >>>>+#define ETHADDR_WILDCARD "\\d*"
> >>>>   #else
> >>>>   #define ETHADDR_WILDCARD
> >>>>   #endif
> >>>>
> >>>
> >>>Ping?
> >>
> >>I haven't gotten an answer to this for nearly one month. It's a small
> >>change, can this go in for v2019.01 please?
> >
> >I'd filed this off to Joe to grab since it is indeed small and a
> >clean-up.
> 
> Will you be taking this after the release or is there anything missing? It's
> assigned to you in patchwork but I didn't get any real reply...

Yes, I'll be picking it up then, thanks for your patience.
Joe Hershberger Jan. 14, 2019, 6:19 p.m. UTC | #6
Hi Simon,

On Mon, Jan 14, 2019 at 10:29 AM Tom Rini <trini@konsulko.com> wrote:
>
> On Mon, Jan 14, 2019 at 04:42:10PM +0100, Simon Goldschmidt wrote:
> > Am 14.12.2018 um 14:28 schrieb Tom Rini:
> > >On Fri, Dec 14, 2018 at 09:56:19AM +0100, Simon Goldschmidt wrote:
> > >
> > >>+Tom
> > >>
> > >>On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
> > >><simon.k.r.goldschmidt@gmail.com> wrote:
> > >>>
> > >>>Am 22.11.2018 um 17:06 schrieb Simon Goldschmidt:
> > >>>>With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
> > >>>>interfaces (0..9) as the number can only have one digit.
> > >>>>
> > >>>>On boards with more than 10 interfaces, this leads to the protection
> > >>>>and format checks being absent for eth10addr and above.
> > >>>>
> > >>>>Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
> > >>>>more than one digit.
> > >>>>
> > >>>>Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > >>>>---
> > >>>>
> > >>>>   include/env_flags.h | 2 +-
> > >>>>   1 file changed, 1 insertion(+), 1 deletion(-)
> > >>>>
> > >>>>diff --git a/include/env_flags.h b/include/env_flags.h
> > >>>>index cc2c34f939..23744e395c 100644
> > >>>>--- a/include/env_flags.h
> > >>>>+++ b/include/env_flags.h
> > >>>>@@ -38,7 +38,7 @@ enum env_flags_varaccess {
> > >>>>
> > >>>>   #ifdef CONFIG_CMD_NET
> > >>>>   #ifdef CONFIG_REGEX
> > >>>>-#define ETHADDR_WILDCARD "\\d?"
> > >>>>+#define ETHADDR_WILDCARD "\\d*"
> > >>>>   #else
> > >>>>   #define ETHADDR_WILDCARD
> > >>>>   #endif
> > >>>>
> > >>>
> > >>>Ping?
> > >>
> > >>I haven't gotten an answer to this for nearly one month. It's a small
> > >>change, can this go in for v2019.01 please?
> > >
> > >I'd filed this off to Joe to grab since it is indeed small and a
> > >clean-up.

Apologies for the dead air... I was out for about a month and then the
holidays hit. I've been trying to catch up on things that languished
in that time and missed this one.

-Joe
> >
> > Will you be taking this after the release or is there anything missing? It's
> > assigned to you in patchwork but I didn't get any real reply...
>
> Yes, I'll be picking it up then, thanks for your patience.
>
> --
> Tom
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Simon Goldschmidt Jan. 14, 2019, 6:23 p.m. UTC | #7
Hi Joe,

Am 14.01.2019 um 19:19 schrieb Joe Hershberger:
> Hi Simon,
> 
> On Mon, Jan 14, 2019 at 10:29 AM Tom Rini <trini@konsulko.com> wrote:
>>
>> On Mon, Jan 14, 2019 at 04:42:10PM +0100, Simon Goldschmidt wrote:
>>> Am 14.12.2018 um 14:28 schrieb Tom Rini:
>>>> On Fri, Dec 14, 2018 at 09:56:19AM +0100, Simon Goldschmidt wrote:
>>>>
>>>>> +Tom
>>>>>
>>>>> On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
>>>>> <simon.k.r.goldschmidt@gmail.com> wrote:
>>>>>>
>>>>>> Am 22.11.2018 um 17:06 schrieb Simon Goldschmidt:
>>>>>>> With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
>>>>>>> interfaces (0..9) as the number can only have one digit.
>>>>>>>
>>>>>>> On boards with more than 10 interfaces, this leads to the protection
>>>>>>> and format checks being absent for eth10addr and above.
>>>>>>>
>>>>>>> Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
>>>>>>> more than one digit.
>>>>>>>
>>>>>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
>>>>>>> ---
>>>>>>>
>>>>>>>    include/env_flags.h | 2 +-
>>>>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>>
>>>>>>> diff --git a/include/env_flags.h b/include/env_flags.h
>>>>>>> index cc2c34f939..23744e395c 100644
>>>>>>> --- a/include/env_flags.h
>>>>>>> +++ b/include/env_flags.h
>>>>>>> @@ -38,7 +38,7 @@ enum env_flags_varaccess {
>>>>>>>
>>>>>>>    #ifdef CONFIG_CMD_NET
>>>>>>>    #ifdef CONFIG_REGEX
>>>>>>> -#define ETHADDR_WILDCARD "\\d?"
>>>>>>> +#define ETHADDR_WILDCARD "\\d*"
>>>>>>>    #else
>>>>>>>    #define ETHADDR_WILDCARD
>>>>>>>    #endif
>>>>>>>
>>>>>>
>>>>>> Ping?
>>>>>
>>>>> I haven't gotten an answer to this for nearly one month. It's a small
>>>>> change, can this go in for v2019.01 please?
>>>>
>>>> I'd filed this off to Joe to grab since it is indeed small and a
>>>> clean-up.
> 
> Apologies for the dead air... I was out for about a month and then the
> holidays hit. I've been trying to catch up on things that languished
> in that time and missed this one.

I thought of something like that, given the time in the year :-)

Note that I sent 4 patches for net that are presumably in your area to 
pick up. This one and:

https://patchwork.ozlabs.org/patch/1001862/
https://patchwork.ozlabs.org/patch/999267/
https://patchwork.ozlabs.org/patch/999268/

Thanks,
Simon

> 
> -Joe
>>>
>>> Will you be taking this after the release or is there anything missing? It's
>>> assigned to you in patchwork but I didn't get any real reply...
>>
>> Yes, I'll be picking it up then, thanks for your patience.
>>
>> --
>> Tom
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot@lists.denx.de
>> https://lists.denx.de/listinfo/u-boot
Joe Hershberger Jan. 15, 2019, 8:58 a.m. UTC | #8
On Thu, Nov 22, 2018 at 10:06 AM Simon Goldschmidt
<simon.k.r.goldschmidt@gmail.com> wrote:
>
> With CONFIG_REGEX enabled, ETHADDR_WILDCARD is set up for up to 10
> interfaces (0..9) as the number can only have one digit.
>
> On boards with more than 10 interfaces, this leads to the protection
> and format checks being absent for eth10addr and above.
>
> Fix this by changing ETHADDR_WILDCARD from "\\d?" to "\\d*" to allow
> more than one digit.
>
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Joe Hershberger Jan. 24, 2019, 5:38 p.m. UTC | #9
Hi Simon,

https://patchwork.ozlabs.org/patch/1001866/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git

Thanks!
-Joe
diff mbox series

Patch

diff --git a/include/env_flags.h b/include/env_flags.h
index cc2c34f939..23744e395c 100644
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -38,7 +38,7 @@  enum env_flags_varaccess {
 
 #ifdef CONFIG_CMD_NET
 #ifdef CONFIG_REGEX
-#define ETHADDR_WILDCARD "\\d?"
+#define ETHADDR_WILDCARD "\\d*"
 #else
 #define ETHADDR_WILDCARD
 #endif