diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-10-02 16:25:08 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-10-02 19:07:30 +0200 |
| commit | fe4b2156256c5bdf52341576571ce9f095d9f085 (patch) | |
| tree | b1046ef4c512bf816a348d12c318bffd5e382ed2 | |
| parent | ebe207d4acf38165adbc45298662982eecdb9e9f (diff) | |
sd-dhcp6: do basic sanity-checking of supplied DUID
| -rw-r--r-- | src/libsystemd-network/sd-dhcp6-client.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 42ad41887d..6ea68c915f 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -69,11 +69,26 @@ struct sd_dhcp6_client { 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]; } _packed_ raw; @@ -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; |