From 6f96bdc58746b1698bf8b3430a6c638f8949daec Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 20 Aug 2021 08:40:11 +0900 Subject: [PATCH 1/2] timesync: fix wrong type for receiving timestamp in nanoseconds Fixes #20482. --- src/test/test-sizeof.c | 2 ++ src/timesync/timesyncd-manager.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 3c9dc180fa..e36bee4e8f 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -89,5 +89,7 @@ int main(void) { printf("big_enum2_pos → %zu\n", sizeof(big_enum2_pos)); printf("big_enum2_neg → %zu\n", sizeof(big_enum2_neg)); + printf("timeval: %zu\n", sizeof(struct timeval)); + printf("timespec: %zu\n", sizeof(struct timespec)); return 0; } diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 1c284f31e3..3a89d9b1fa 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -416,7 +416,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re .iov_base = &ntpmsg, .iov_len = sizeof(ntpmsg), }; - CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct timeval))) control; + CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct timespec))) control; union sockaddr_union server_addr; struct msghdr msghdr = { .msg_iov = &iov, From 6da22a2fa592cc908d26c732b537d8b4fc004280 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 20 Aug 2021 08:44:27 +0900 Subject: [PATCH 2/2] icmp6: drop unnecessary assertion Follow-up for 3691bcf3c5eebdcca5b4f1c51c745441c57a6cd1. --- src/libsystemd-network/icmp6-util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index 67c6b55d84..0b8c3e4cc3 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -186,7 +186,6 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, /* namelen == 0 only happens when running the test-suite over a socketpair */ - assert(!(msg.msg_flags & MSG_CTRUNC)); assert(!(msg.msg_flags & MSG_TRUNC)); CMSG_FOREACH(cmsg, &msg) {