SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-dhcp: drop meaningless checking

Browse Source 
mac_addr is not dynamically allocated.

Fixes CID 1395162 and 1395164.
This commit is contained in:
Yu Watanabe
2018-09-04 13:07:37 -07:00
committed by Filipe Brandenburger
parent 862764560b
commit 339697f081
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-dhcp-client.c
+2 -2
View 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);
src/libsystemd-network/sd-dhcp6-client.c
+2 -2
View 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);