From fe4b2156256c5bdf52341576571ce9f095d9f085 Mon Sep 17 00:00:00 2001

From: Tom Gundersen <teg@jklm.no>

Date: Thu, 2 Oct 2014 16:25:08 +0200

Subject: [PATCH] sd-dhcp6: do basic sanity-checking of supplied DUID

---

 src/libsystemd-network/sd-dhcp6-client.c | 37 ++++++++++++++++++++++++++++++++

 1 file changed, 37 insertions(+)

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;