2013-08-01 12:58:17

by Olaf Hering

Subject: [PATCH] Tools: hv: in kvp_set_ip_info free mac_addr right after usage

... to simplify error path in upcoming changes.

Signed-off-by: Olaf Hering <[email protected]>
---
tools/hv/hv_kvp_daemon.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 418ac55..ba075e5 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -1299,6 +1299,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
}

error = kvp_write_file(file, "HWADDR", "", mac_addr);
+ free(mac_addr);
if (error)
goto setval_error;

@@ -1344,7 +1345,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
goto setval_error;

setval_done:
- free(mac_addr);
fclose(file);

/*
@@ -1358,7 +1358,6 @@ setval_done:

setval_error:
syslog(LOG_ERR, "Failed to write config file");
- free(mac_addr);
fclose(file);
return error;
}

2013-08-01 14:41:49

by KY Srinivasan

Subject: RE: [PATCH] Tools: hv: in kvp_set_ip_info free mac_addr right after usage

> -----Original Message-----
> From: Olaf Hering [mailto:[email protected]]
> Sent: Thursday, August 01, 2013 8:58 AM
> To: KY Srinivasan; [email protected]
> Cc: [email protected]; Olaf Hering
> Subject: [PATCH] Tools: hv: in kvp_set_ip_info free mac_addr right after usage
>
> ... to simplify error path in upcoming changes.
>
> Signed-off-by: Olaf Hering <[email protected]>
Signed-off-by: K. Y. Srinivasan <[email protected]>
> ---
> tools/hv/hv_kvp_daemon.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> index 418ac55..ba075e5 100644
> --- a/tools/hv/hv_kvp_daemon.c
> +++ b/tools/hv/hv_kvp_daemon.c
> @@ -1299,6 +1299,7 @@ static int kvp_set_ip_info(char *if_name, struct
> hv_kvp_ipaddr_value *new_val)
> }
>
> error = kvp_write_file(file, "HWADDR", "", mac_addr);
> + free(mac_addr);
> if (error)
> goto setval_error;
>
> @@ -1344,7 +1345,6 @@ static int kvp_set_ip_info(char *if_name, struct
> hv_kvp_ipaddr_value *new_val)
> goto setval_error;
>
> setval_done:
> - free(mac_addr);
> fclose(file);
>
> /*
> @@ -1358,7 +1358,6 @@ setval_done:
>
> setval_error:
> syslog(LOG_ERR, "Failed to write config file");
> - free(mac_addr);
> fclose(file);
> return error;
> }
>
>

2013-08-02 03:10:49

by Greg Kroah-Hartman

Subject: Re: [PATCH] Tools: hv: in kvp_set_ip_info free mac_addr right after usage

On Thu, Aug 01, 2013 at 02:35:36PM +0000, KY Srinivasan wrote:
>
>
> > -----Original Message-----
> > From: Olaf Hering [mailto:[email protected]]
> > Sent: Thursday, August 01, 2013 8:58 AM
> > To: KY Srinivasan; [email protected]
> > Cc: [email protected]; Olaf Hering
> > Subject: [PATCH] Tools: hv: in kvp_set_ip_info free mac_addr right after usage
> >
> > ... to simplify error path in upcoming changes.
> >
> > Signed-off-by: Olaf Hering <[email protected]>
> Signed-off-by: K. Y. Srinivasan <[email protected]>

Can you resend this as well?

thanks,

greg k-h