shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

dhcp6: do not set T1 and T2 by dhcp6_option_append_ia() in client

Browse Source
This commit is contained in:
Yu Watanabe 2021-02-22 21:54:32 +09:00
parent 1e84213a43
commit e7613578b4
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/libsystemd-network/dhcp6-option.c
View File

@ -113,10 +113,13 @@ int dhcp6_option_append_vendor_option(uint8_t **buf, size_t *buflen, OrderedHash
} }
int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) { int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
uint16_t len; size_t ia_buflen, ia_addrlen = 0;
uint8_t *ia_hdr; struct ia_na ia_na;
size_t iaid_offset, ia_buflen, ia_addrlen = 0; struct ia_ta ia_ta;
DHCP6Address *addr; DHCP6Address *addr;
uint8_t *ia_hdr;
uint16_t len;
void *p;
int r; int r;
assert_return(buf, -EINVAL); assert_return(buf, -EINVAL);
@ -124,15 +127,23 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
assert_return(buflen, -EINVAL); assert_return(buflen, -EINVAL);
assert_return(ia, -EINVAL); assert_return(ia, -EINVAL);
/* client should not send set T1 and T2. See, RFC 8415, and issue #18090. */
switch (ia->type) { switch (ia->type) {
case SD_DHCP6_OPTION_IA_NA: case SD_DHCP6_OPTION_IA_NA:
len = DHCP6_OPTION_IA_NA_LEN; len = DHCP6_OPTION_IA_NA_LEN;
iaid_offset = offsetof(DHCP6IA, ia_na); ia_na = (struct ia_na) {
.id = ia->ia_na.id,
};
p = &ia_na;
break; break;
case SD_DHCP6_OPTION_IA_TA: case SD_DHCP6_OPTION_IA_TA:
len = DHCP6_OPTION_IA_TA_LEN; len = DHCP6_OPTION_IA_TA_LEN;
iaid_offset = offsetof(DHCP6IA, ia_ta); ia_ta = (struct ia_ta) {
.id = ia->ia_ta.id,
};
p = &ia_ta;
break; break;
default: default:
@ -148,30 +159,29 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
*buf += offsetof(DHCP6Option, data); *buf += offsetof(DHCP6Option, data);
*buflen -= offsetof(DHCP6Option, data); *buflen -= offsetof(DHCP6Option, data);
memcpy(*buf, (char*) ia + iaid_offset, len); memcpy(*buf, p, len);
*buf += len; *buf += len;
*buflen -= len; *buflen -= len;
LIST_FOREACH(addresses, addr, ia->addresses) { LIST_FOREACH(addresses, addr, ia->addresses) {
r = option_append_hdr(buf, buflen, SD_DHCP6_OPTION_IAADDR, struct iaaddr a = {
sizeof(addr->iaaddr)); .address = addr->iaaddr.address,
};
r = option_append_hdr(buf, buflen, SD_DHCP6_OPTION_IAADDR, sizeof(struct iaaddr));
if (r < 0) if (r < 0)
return r; return r;
memcpy(*buf, &addr->iaaddr, sizeof(addr->iaaddr)); memcpy(*buf, &a, sizeof(struct iaaddr));
*buf += sizeof(addr->iaaddr); *buf += sizeof(struct iaaddr);
*buflen -= sizeof(addr->iaaddr); *buflen -= sizeof(struct iaaddr);
ia_addrlen += offsetof(DHCP6Option, data) + sizeof(addr->iaaddr); ia_addrlen += offsetof(DHCP6Option, data) + sizeof(struct iaaddr);
} }
r = option_append_hdr(&ia_hdr, &ia_buflen, ia->type, len + ia_addrlen); return option_append_hdr(&ia_hdr, &ia_buflen, ia->type, len + ia_addrlen);
if (r < 0)
return r;
return 0;
} }
int dhcp6_option_append_fqdn(uint8_t **buf, size_t *buflen, const char *fqdn) { int dhcp6_option_append_fqdn(uint8_t **buf, size_t *buflen, const char *fqdn) {

15
src/libsystemd-network/test-dhcp6-client.c
View File

@ -650,12 +650,12 @@ static int test_client_verify_request(DHCP6Message *request, size_t len) {
assert_se(optlen == 40); assert_se(optlen == 40);
assert_se(!memcmp(optval, &test_iaid, sizeof(test_iaid))); assert_se(!memcmp(optval, &test_iaid, sizeof(test_iaid)));
val = htobe32(80); /* T1 and T2 should not be set. */
val = 0;
assert_se(!memcmp(optval + 4, &val, sizeof(val))); assert_se(!memcmp(optval + 4, &val, sizeof(val)));
val = htobe32(120);
assert_se(!memcmp(optval + 8, &val, sizeof(val))); assert_se(!memcmp(optval + 8, &val, sizeof(val)));
/* Then, this should refuse all addresses. */
assert_se(dhcp6_option_parse_ia(option, &lease->ia, NULL) >= 0); assert_se(dhcp6_option_parse_ia(option, &lease->ia, NULL) >= 0);
break; break;
@ -694,14 +694,7 @@ static int test_client_verify_request(DHCP6Message *request, size_t len) {
found_elapsed_time); found_elapsed_time);
sd_dhcp6_lease_reset_address_iter(lease); sd_dhcp6_lease_reset_address_iter(lease);
assert_se(sd_dhcp6_lease_get_address(lease, &addr, &lt_pref, assert_se(sd_dhcp6_lease_get_address(lease, &addr, &lt_pref, &lt_valid) == -ENOMSG);
&lt_valid) >= 0);
assert_se(!memcmp(&addr, &msg_advertise[42], sizeof(addr)));
assert_se(lt_pref == 150);
assert_se(lt_valid == 180);
assert_se(sd_dhcp6_lease_get_address(lease, &addr, &lt_pref,
&lt_valid) == -ENOMSG);
return 0; return 0;
} }