diff options
author | Olaf Hering <olaf@aepfle.de> | 2013-08-04 10:41:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-05 02:36:31 -0400 |
commit | 57969af029b073a99ce27c2170cbcac5bd557606 (patch) | |
tree | c8a620a1a04732e698711f9aa198d9b717085b6c /tools/hv | |
parent | dafffd88e88493f4e8693a51b285a5d4c828fd6f (diff) |
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) | |||
1299 | } | 1299 | } |
1300 | 1300 | ||
1301 | error = kvp_write_file(file, "HWADDR", "", mac_addr); | 1301 | error = kvp_write_file(file, "HWADDR", "", mac_addr); |
1302 | free(mac_addr); | ||
1302 | if (error) | 1303 | if (error) |
1303 | goto setval_error; | 1304 | goto setval_error; |
1304 | 1305 | ||
@@ -1344,7 +1345,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) | |||
1344 | goto setval_error; | 1345 | goto setval_error; |
1345 | 1346 | ||
1346 | setval_done: | 1347 | setval_done: |
1347 | free(mac_addr); | ||
1348 | fclose(file); | 1348 | fclose(file); |
1349 | 1349 | ||
1350 | /* | 1350 | /* |
@@ -1358,7 +1358,6 @@ setval_done: | |||
1358 | 1358 | ||
1359 | setval_error: | 1359 | setval_error: |
1360 | syslog(LOG_ERR, "Failed to write config file"); | 1360 | syslog(LOG_ERR, "Failed to write config file"); |
1361 | free(mac_addr); | ||
1362 | fclose(file); | 1361 | fclose(file); |
1363 | return error; | 1362 | return error; |
1364 | } | 1363 | } |