]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-dhcp: drop meaningless checking
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 24 Aug 2018 02:14:32 +0000 (11:14 +0900)
committerFilipe Brandenburger <filbranden@google.com>
Tue, 4 Sep 2018 20:07:37 +0000 (13:07 -0700)
mac_addr is not dynamically allocated.

Fixes CID 1395162 and 1395164.

src/libsystemd-network/sd-dhcp-client.c
src/libsystemd-network/sd-dhcp6-client.c

index 9777040fbd90b34270819441881f070a95c467c3..0995f091f5d020437a38c96b2e0139df35d7e1b1 100644 (file)
@@ -385,7 +385,7 @@ static int dhcp_client_set_iaid_duid_internal(
         } else
                 switch (duid_type) {
                 case DUID_TYPE_LLT:
-                        if (!client->mac_addr || client->mac_addr_len == 0)
+                        if (client->mac_addr_len == 0)
                                 return -EOPNOTSUPP;
 
                         r = dhcp_identifier_set_duid_llt(&client->client_id.ns.duid, llt_time, client->mac_addr, client->mac_addr_len, client->arp_type, &len);
@@ -398,7 +398,7 @@ static int dhcp_client_set_iaid_duid_internal(
                                 return r;
                         break;
                 case DUID_TYPE_LL:
-                        if (!client->mac_addr || client->mac_addr_len == 0)
+                        if (client->mac_addr_len == 0)
                                 return -EOPNOTSUPP;
 
                         r = dhcp_identifier_set_duid_ll(&client->client_id.ns.duid, client->mac_addr, client->mac_addr_len, client->arp_type, &len);
index 4f3993134f0ccdab0847c12ffeea1f14e3efd03e..0caed55c2641dfb7000c5c7b5b12c69a8b364f9b 100644 (file)
@@ -205,7 +205,7 @@ static int dhcp6_client_set_duid_internal(
         } else
                 switch (duid_type) {
                 case DUID_TYPE_LLT:
-                        if (!client->mac_addr || client->mac_addr_len == 0)
+                        if (client->mac_addr_len == 0)
                                 return -EOPNOTSUPP;
 
                         r = dhcp_identifier_set_duid_llt(&client->duid, 0, client->mac_addr, client->mac_addr_len, client->arp_type, &client->duid_len);
@@ -218,7 +218,7 @@ static int dhcp6_client_set_duid_internal(
                                 return r;
                         break;
                 case DUID_TYPE_LL:
-                        if (!client->mac_addr || client->mac_addr_len == 0)
+                        if (client->mac_addr_len == 0)
                                 return -EOPNOTSUPP;
 
                         r = dhcp_identifier_set_duid_ll(&client->duid, client->mac_addr, client->mac_addr_len, client->arp_type, &client->duid_len);