picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-dhcp6: do basic sanity-checking of supplied DUID

This commit is contained in:
Tom Gundersen 2014-10-02 16:25:08 +02:00
parent ebe207d4ac
commit fe4b215625
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libsystemd-network/sd-dhcp6-client.c
View File

@ -68,11 +68,26 @@ struct sd_dhcp6_client {
sd_dhcp6_client_cb_t cb;
void *userdata;
union {
struct {
uint16_t type; /* DHCP6_DUID_LLT */
uint16_t htype;
uint32_t time;
uint8_t haddr[0];
} _packed_ llt;
struct {
uint16_t type; /* DHCP6_DUID_EN */
uint32_t pen;
uint8_t id[8];
} _packed_ en;
struct {
uint16_t type; /* DHCP6_DUID_LL */
uint16_t htype;
uint8_t haddr[0];
} _packed_ ll;
struct {
uint16_t type; /* DHCP6_DUID_UUID */
sd_id128_t uuid;
} _packed_ uuid;
struct {
uint16_t type;
uint8_t data[MAX_DUID_LEN];
@ -165,6 +180,28 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du
assert_return(duid, -EINVAL);
assert_return(duid_len > 0 && duid_len <= MAX_DUID_LEN, -EINVAL);
switch (type) {
case DHCP6_DUID_LLT:
if (duid_len <= sizeof(client->duid.llt))
return -EINVAL;
break;
case DHCP6_DUID_EN:
if (duid_len != sizeof(client->duid.en))
return -EINVAL;
break;
case DHCP6_DUID_LL:
if (duid_len <= sizeof(client->duid.ll))
return -EINVAL;
break;
case DHCP6_DUID_UUID:
if (duid_len != sizeof(client->duid.uuid))
return -EINVAL;
break;
default:
/* accept unknown type in order to be forward compatible */
break;
}
client->duid.raw.type = htobe16(type);
memcpy(&client->duid.raw.data, duid, duid_len);
client->duid_len = duid_len;