diff options
| author |   Olaf Hering <olaf@aepfle.de> | 2013-08-04 16:41:24 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-05 14:36:31 +0800 |
| commit | 57969af029b073a99ce27c2170cbcac5bd557606 (patch) | |
| tree | c8a620a1a04732e698711f9aa198d9b717085b6c /tools/hv | |
| parent | Merge tag 'extcon-next-for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next (diff) | |
| download | linux-dev-57969af029b073a99ce27c2170cbcac5bd557606.tar.xz linux-dev-57969af029b073a99ce27c2170cbcac5bd557606.zip | |
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 <olaf@aepfle.de>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/hv')
| -rw-r--r-- | tools/hv/hv_kvp_daemon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 418ac5548f98..ba075e514422 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; } |