| From 875f3773e383d99e7d43020f02acad7681a05914 Mon Sep 17 00:00:00 2001 |
| From: Yu Watanabe <watanabe.yu+github@gmail.com> |
| Date: Thu, 24 Jun 2021 00:51:52 +0900 |
| Subject: [PATCH] sd-dhcp-client: shorten code a bit |
| |
| Upstream-Status: Backport |
| CVE: CVE-2020-13529 |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| --- |
| src/libsystemd-network/sd-dhcp-client.c | 13 ++++--------- |
| 1 file changed, 4 insertions(+), 9 deletions(-) |
| |
| diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c |
| index 86bc3c6181..ef3a7d2c6b 100644 |
| --- a/src/libsystemd-network/sd-dhcp-client.c |
| +++ b/src/libsystemd-network/sd-dhcp-client.c |
| @@ -1760,7 +1760,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) { |
| static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, int len) { |
| DHCP_CLIENT_DONT_DESTROY(client); |
| char time_string[FORMAT_TIMESPAN_MAX]; |
| - int r = 0, notify_event = 0; |
| + int r, notify_event = 0; |
| |
| assert(client); |
| assert(client->event); |
| @@ -1783,9 +1783,6 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i |
| 0, 0, |
| client_timeout_resend, client, |
| client->event_priority, "dhcp4-resend-timer", true); |
| - if (r < 0) |
| - goto error; |
| - |
| break; |
| |
| case DHCP_STATE_REBOOTING: |
| @@ -1813,7 +1810,6 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i |
| |
| client->start_delay = CLAMP(client->start_delay * 2, |
| RESTART_AFTER_NAK_MIN_USEC, RESTART_AFTER_NAK_MAX_USEC); |
| - |
| return 0; |
| } |
| if (r < 0) |
| @@ -1866,19 +1862,18 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i |
| goto error; |
| |
| r = client_timeout_t1(NULL, 0, client); |
| - if (r < 0) |
| - goto error; |
| - |
| break; |
| |
| case DHCP_STATE_INIT: |
| case DHCP_STATE_INIT_REBOOT: |
| - |
| + r = 0; |
| break; |
| |
| case DHCP_STATE_STOPPED: |
| r = -EINVAL; |
| goto error; |
| + default: |
| + assert_not_reached("invalid state"); |
| } |
| |
| error: |