diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index 93aadd1e4fa..b0572585e60 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -157,7 +157,7 @@ int dhcp_identifier_set_duid_raw( if (duid_type < 0 || duid_type > UINT16_MAX) return -EINVAL; - if (buf_len > MAX_DUID_LEN) + if (buf_len > MAX_DUID_DATA_LEN) return -EINVAL; unaligned_write_be16(&ret_duid->type, duid_type); diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h index 3830b5952cf..28acb2ca565 100644 --- a/src/libsystemd-network/dhcp-identifier.h +++ b/src/libsystemd-network/dhcp-identifier.h @@ -25,6 +25,7 @@ typedef enum DUIDType { * A DUID can be no more than 128 octets long (not including the type code). */ #define MAX_DUID_LEN 128 +#define MAX_DUID_DATA_LEN (MAX_DUID_LEN - sizeof(be16_t)) /* https://tools.ietf.org/html/rfc3315#section-9.1 */ struct duid { @@ -51,7 +52,7 @@ struct duid { sd_id128_t uuid; } _packed_ uuid; struct { - uint8_t data[MAX_DUID_LEN]; + uint8_t data[MAX_DUID_DATA_LEN]; } _packed_ raw; }; } _packed_; diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index 5f9ef80e3e5..8bd20ea21cb 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -1243,7 +1243,7 @@ int config_parse_duid_rawdata( void *data, void *userdata) { - uint8_t raw_data[MAX_DUID_LEN]; + uint8_t raw_data[MAX_DUID_DATA_LEN]; unsigned count = 0; bool force = ltype; DUID *duid = ASSERT_PTR(data); @@ -1271,7 +1271,7 @@ int config_parse_duid_rawdata( if (r == 0) break; - if (count >= MAX_DUID_LEN) { + if (count >= MAX_DUID_DATA_LEN) { log_syntax(unit, LOG_WARNING, filename, line, 0, "Max DUID length exceeded, ignoring assignment: %s.", rvalue); return 0; } diff --git a/src/network/networkd-dhcp-common.h b/src/network/networkd-dhcp-common.h index 07367d4d24b..ea942af721d 100644 --- a/src/network/networkd-dhcp-common.h +++ b/src/network/networkd-dhcp-common.h @@ -48,7 +48,7 @@ typedef struct DUID { DUIDType type; uint8_t raw_data_len; - uint8_t raw_data[MAX_DUID_LEN]; + uint8_t raw_data[MAX_DUID_DATA_LEN]; usec_t llt_time; bool set; } DUID; diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c index f6f068706a8..22dd991fb0e 100644 --- a/src/network/test-networkd-conf.c +++ b/src/network/test-networkd-conf.c @@ -83,9 +83,26 @@ static void test_config_parse_ether_addrs_one(const char *rvalue, const struct e assert_se(set_size(s) == 0); } -#define BYTES_0_128 "0:1:2:3:4:5:6:7:8:9:a:b:c:d:e:f:10:11:12:13:14:15:16:17:18:19:1a:1b:1c:1d:1e:1f:20:21:22:23:24:25:26:27:28:29:2a:2b:2c:2d:2e:2f:30:31:32:33:34:35:36:37:38:39:3a:3b:3c:3d:3e:3f:40:41:42:43:44:45:46:47:48:49:4a:4b:4c:4d:4e:4f:50:51:52:53:54:55:56:57:58:59:5a:5b:5c:5d:5e:5f:60:61:62:63:64:65:66:67:68:69:6a:6b:6c:6d:6e:6f:70:71:72:73:74:75:76:77:78:79:7a:7b:7c:7d:7e:7f:80" +#define BYTES_0_126 \ + "00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f:" \ + "10:11:12:13:14:15:16:17:18:19:1a:1b:1c:1d:1e:1f:" \ + "20:21:22:23:24:25:26:27:28:29:2a:2b:2c:2d:2e:2f:" \ + "30:31:32:33:34:35:36:37:38:39:3a:3b:3c:3d:3e:3f:" \ + "40:41:42:43:44:45:46:47:48:49:4a:4b:4c:4d:4e:4f:" \ + "50:51:52:53:54:55:56:57:58:59:5a:5b:5c:5d:5e:5f:" \ + "60:61:62:63:64:65:66:67:68:69:6a:6b:6c:6d:6e:6f:" \ + "70:71:72:73:74:75:76:77:78:79:7a:7b:7c:7d:7e" -#define BYTES_1_128 {0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xa,0xb,0xc,0xd,0xe,0xf,0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,0x80} +#define BYTES_1_126 { \ + 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, \ + 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f, \ + 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f, \ + 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f, \ + 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f, \ + 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f, \ + 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f, \ + 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e \ +} TEST(config_parse_duid_rawdata) { test_config_parse_duid_rawdata_one("", 0, &(DUID){}); @@ -99,8 +116,8 @@ TEST(config_parse_duid_rawdata) { &(DUID){0, 8, {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7}}); test_config_parse_duid_rawdata_one("11::", 0, &(DUID){0, 1, {0x11}}); /* FIXME: should this be an error? */ test_config_parse_duid_rawdata_one("abcdef", 0, &(DUID){}); - test_config_parse_duid_rawdata_one(BYTES_0_128, 0, &(DUID){}); - test_config_parse_duid_rawdata_one(&BYTES_0_128[2], 0, &(DUID){0, 128, BYTES_1_128}); + test_config_parse_duid_rawdata_one(BYTES_0_126, 0, &(DUID){}); + test_config_parse_duid_rawdata_one(&BYTES_0_126[3], 0, &(DUID){0, 126, BYTES_1_126}); } TEST(config_parse_ether_addr) {