colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-dhcp6-client: fix off-by-two error in DUID length

Browse Source 
The duid data passed by the client does not include the DUID type,
but client->duid_len does account for the size of the DUID type.
This commit is contained in:
Dan Williams
2014-10-31 11:42:53 -05:00
parent 20462b5095
commit 9f6c81caa0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
View File

@@ -200,19 +200,19 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du
switch (type) { switch (type) {
case DHCP6_DUID_LLT: case DHCP6_DUID_LLT:
if (duid_len <= sizeof(client->duid.llt)) if (duid_len <= sizeof(client->duid.llt) - 2)
return -EINVAL; return -EINVAL;
break; break;
case DHCP6_DUID_EN: case DHCP6_DUID_EN:
if (duid_len != sizeof(client->duid.en)) if (duid_len != sizeof(client->duid.en) - 2)
return -EINVAL; return -EINVAL;
break; break;
case DHCP6_DUID_LL: case DHCP6_DUID_LL:
if (duid_len <= sizeof(client->duid.ll)) if (duid_len <= sizeof(client->duid.ll) - 2)
return -EINVAL; return -EINVAL;
break; break;
case DHCP6_DUID_UUID: case DHCP6_DUID_UUID:
if (duid_len != sizeof(client->duid.uuid)) if (duid_len != sizeof(client->duid.uuid) - 2)
return -EINVAL; return -EINVAL;
break; break;
default: default:
@@ -222,7 +222,7 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du
client->duid.raw.type = htobe16(type); client->duid.raw.type = htobe16(type);
memcpy(&client->duid.raw.data, duid, duid_len); memcpy(&client->duid.raw.data, duid, duid_len);
client->duid_len = duid_len; client->duid_len = duid_len + 2; /* +2 for sizeof(type) */
return 0; return 0;
} }