shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-13 13:17:43 +03:00
Code

Merge pull request #22520 from yuwata/sd-dhcp6-client-cosmetic-follow-ups

Browse Source 
sd-dhcp6-client: several cosmetic follow-ups
This commit is contained in:
Yu Watanabe 2022-02-16 23:02:51 +09:00 committed by GitHub
commit 7f96350d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/basic/memory-util.h
View File

@ -15,7 +15,7 @@ size_t page_size(void) _pure_;
#define PAGE_ALIGN_DOWN(l) ((l) & ~(page_size() - 1))
#define PAGE_OFFSET(l) ((l) & (page_size() - 1))
/* Normal memcpy requires src to be nonnull. We do nothing if n is 0. */
/* Normal memcpy() requires src to be nonnull. We do nothing if n is 0. */
static inline void *memcpy_safe(void *dst, const void *src, size_t n) {
if (n == 0)
return dst;
@ -23,7 +23,15 @@ static inline void *memcpy_safe(void *dst, const void *src, size_t n) {
return memcpy(dst, src, n);
}
/* Normal memcmp requires s1 and s2 to be nonnull. We do nothing if n is 0. */
/* Normal mempcpy() requires src to be nonnull. We do nothing if n is 0. */
static inline void *mempcpy_safe(void *dst, const void *src, size_t n) {
if (n == 0)
return dst;
assert(src);
return mempcpy(dst, src, n);
}
/* Normal memcmp() requires s1 and s2 to be nonnull. We do nothing if n is 0. */
static inline int memcmp_safe(const void *s1, const void *s2, size_t n) {
if (n == 0)
return 0;

10
src/libsystemd-network/dhcp-identifier.c
View File

@ -91,7 +91,7 @@ static int dhcp_identifier_set_duid_llt(const uint8_t *addr, size_t addr_len, ui
unaligned_write_be32(&ret_duid->llt.time, time_from_2000y);
memcpy(ret_duid->llt.haddr, addr, addr_len);
*ret_len = sizeof(ret_duid->type) + sizeof(ret_duid->llt.htype) + sizeof(ret_duid->llt.time) + addr_len;
*ret_len = offsetof(struct duid, llt.haddr) + addr_len;
return 0;
}
@ -115,7 +115,7 @@ static int dhcp_identifier_set_duid_ll(const uint8_t *addr, size_t addr_len, uin
unaligned_write_be16(&ret_duid->ll.htype, arp_type);
memcpy(ret_duid->ll.haddr, addr, addr_len);
*ret_len = sizeof(ret_duid->type) + sizeof(ret_duid->ll.htype) + addr_len;
*ret_len = offsetof(struct duid, ll.haddr) + addr_len;
return 0;
}
@ -146,7 +146,7 @@ int dhcp_identifier_set_duid_en(bool test_mode, struct duid *ret_duid, size_t *r
hash = htole64(siphash24(&machine_id, sizeof(machine_id), HASH_KEY.bytes));
memcpy(ret_duid->en.id, &hash, sizeof(ret_duid->en.id));
*ret_len = sizeof(ret_duid->type) + sizeof(ret_duid->en);
*ret_len = offsetof(struct duid, en.id) + sizeof(ret_duid->en.id);
if (test_mode)
assert_se(memcmp(ret_duid, (const uint8_t[]) { 0x00, 0x02, 0x00, 0x00, 0xab, 0x11, 0x61, 0x77, 0x40, 0xde, 0x13, 0x42, 0xc3, 0xa2 }, *ret_len) == 0);
@ -166,9 +166,9 @@ static int dhcp_identifier_set_duid_uuid(struct duid *ret_duid, size_t *ret_len)
return r;
unaligned_write_be16(&ret_duid->type, DUID_TYPE_UUID);
memcpy(ret_duid->raw.data, &machine_id, sizeof(machine_id));
memcpy(&ret_duid->uuid.uuid, &machine_id, sizeof(machine_id));
*ret_len = sizeof(ret_duid->type) + sizeof(machine_id);
*ret_len = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
return 0;
}

4
src/libsystemd-network/dhcp6-lease-internal.h
View File

@ -28,8 +28,8 @@ struct sd_dhcp6_lease {
usec_t lifetime_valid;
struct in6_addr server_address;
DHCP6IA *ia_na;
DHCP6IA *ia_pd;
DHCP6IA *ia_na; /* Identity association non-temporary addresses */
DHCP6IA *ia_pd; /* Identity association prefix delegation */
DHCP6Address *addr_iter;
DHCP6Address *prefix_iter;

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

@ -236,9 +236,7 @@ int dhcp6_option_append(uint8_t **buf, size_t *buflen, uint16_t code,
if (r < 0)
return r;
memcpy_safe(*buf, optval, optlen);
*buf += optlen;
*buf = mempcpy_safe(*buf, optval, optlen);
*buflen -= optlen;
return 0;
@ -294,9 +292,7 @@ static int option_append_ia_address(uint8_t **buf, size_t *buflen, const struct
if (r < 0)
return r;
memcpy(*buf, &a, sizeof(struct iaaddr));
*buf += sizeof(struct iaaddr);
*buf = mempcpy(*buf, &a, sizeof(struct iaaddr));
*buflen -= sizeof(struct iaaddr);
return offsetof(DHCP6Option, data) + sizeof(struct iaaddr);
@ -324,9 +320,7 @@ static int option_append_pd_prefix(uint8_t **buf, size_t *buflen, const struct i
if (r < 0)
return r;
memcpy(*buf, &p, sizeof(struct iapdprefix));
*buf += sizeof(struct iapdprefix);
*buf = mempcpy(*buf, &p, sizeof(struct iapdprefix));
*buflen -= sizeof(struct iapdprefix);
return offsetof(DHCP6Option, data) + sizeof(struct iapdprefix);
@ -357,7 +351,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
break;
case SD_DHCP6_OPTION_IA_TA:
len = sizeof(be32_t); /* IA_TA does not have lifetime. */
len = sizeof(header.id); /* IA_TA does not have lifetime. */
header = (struct ia_header) {
.id = ia->header.id,
};
@ -377,8 +371,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
*buf += offsetof(DHCP6Option, data);
*buflen -= offsetof(DHCP6Option, data);
memcpy(*buf, &header, len);
*buf += len;
*buf = mempcpy(*buf, &header, len);
*buflen -= len;
LIST_FOREACH(addresses, addr, ia->addresses) {