[PATCH 1/2] ifup: remove deletion of ip env

[PATCH 1/2] ifup: remove deletion of ip env

[Alexander Aring]

This patch removes the deletion of ip env and changes to the behaviour
that it use previous ip=$TYPE assignments if ip env is not part of network
env which will be sourced.

Example:
somewhere in shell: ip=dhcp
\- in case of ip=$TYPE in network env: overwrites the ip env
\- in case of NO ip=$TYPE in network env: use the ip="dhcp" from shell

Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
Don't know if this patch breaks to much handling with previous env handling,
but I would except such handling.

Also don't know if the example is correct or I mixed something with
global/local envs.

Maybe apply patch 2/2 only.

 net/ifup.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/ifup.c b/net/ifup.c
index f22afc9..17e1b2f 100644
--- a/net/ifup.c
+++ b/net/ifup.c
@@ -62,8 +62,6 @@ int ifup(const char *name, unsigned flags)
 
 	env_push_context();
 
-	setenv("ip", "");
-
 	for (i = 0; i < ARRAY_SIZE(vars); i++)
 		setenv(vars[i], "");
 
-- 
2.8.3


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

[PATCH 2/2] ifup: fix handling when ip env is not given

[Alexander Aring]

This patch handles the ip env to "" if no ip env is given. Otherwise
we get a NULL pointer derefence.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
 net/ifup.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/ifup.c b/net/ifup.c
index 17e1b2f..59df069 100644
--- a/net/ifup.c
+++ b/net/ifup.c
@@ -94,6 +94,9 @@ int ifup(const char *name, unsigned flags)
 		goto out;
 
 	ip = getenv("ip");
+	if (!ip)
+		ip = "";
+
 	if (!strcmp(ip, "dhcp")) {
 		ret = run_command("dhcp");
 		if (ret)
-- 
2.8.3


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

Re: [PATCH 1/2] ifup: remove deletion of ip env

[Sascha Hauer]

On Tue, Jun 14, 2016 at 08:55:05AM +0200, Alexander Aring wrote:
> This patch removes the deletion of ip env and changes to the behaviour
> that it use previous ip=$TYPE assignments if ip env is not part of network
> env which will be sourced.
> 
> Example:
> somewhere in shell: ip=dhcp
> \- in case of ip=$TYPE in network env: overwrites the ip env
> \- in case of NO ip=$TYPE in network env: use the ip="dhcp" from shell
> 
> Signed-off-by: Alexander Aring <aar@pengutronix.de>
> ---
> Don't know if this patch breaks to much handling with previous env handling,
> but I would except such handling.
> 
> Also don't know if the example is correct or I mixed something with
> global/local envs.
> 
> Maybe apply patch 2/2 only.
> 
>  net/ifup.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/net/ifup.c b/net/ifup.c
> index f22afc9..17e1b2f 100644
> --- a/net/ifup.c
> +++ b/net/ifup.c
> @@ -62,8 +62,6 @@ int ifup(const char *name, unsigned flags)
>  
>  	env_push_context();
>  
> -	setenv("ip", "");
> -

Erm, no. It was intentional to *not* leak in previous settings of the ip
variable to make the behaviour deterministic and not dependent on
previous env settings.

Sascha

-- 
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

Re: [PATCH 2/2] ifup: fix handling when ip env is not given

[Sascha Hauer]

On Tue, Jun 14, 2016 at 08:55:06AM +0200, Alexander Aring wrote:
> This patch handles the ip env to "" if no ip env is given. Otherwise
> we get a NULL pointer derefence.
> 
> Signed-off-by: Alexander Aring <aar@pengutronix.de>
> ---
>  net/ifup.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/net/ifup.c b/net/ifup.c
> index 17e1b2f..59df069 100644
> --- a/net/ifup.c
> +++ b/net/ifup.c
> @@ -94,6 +94,9 @@ int ifup(const char *name, unsigned flags)
>  		goto out;
>  
>  	ip = getenv("ip");
> +	if (!ip)
> +		ip = "";
> +
>  	if (!strcmp(ip, "dhcp")) {
>  		ret = run_command("dhcp");
>  		if (ret)
> -- 
> 2.8.3
> 
> 
> _______________________________________________
> 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