From e61614099f7b05bea86cd06aab1469f842636906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 13 Apr 2019 11:47:47 +0200 Subject: [PATCH 1/2] network: avoid warning about unaligned pointers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With gcc-9.0.1-0.10.fc30.x86_64: ../src/network/netdev/macsec.c: In function ‘config_parse_macsec_port’: ../src/network/netdev/macsec.c:584:24: warning: taking address of packed member of ‘struct ’ may result in an unaligned pointer value [-Waddress-of-packed-member] 584 | dest = &c->sci.port; | ^~~~~~~~~~~~ ../src/network/netdev/macsec.c:592:24: warning: taking address of packed member of ‘struct ’ may result in an unaligned pointer value [-Waddress-of-packed-member] 592 | dest = &b->sci.port; | ^~~~~~~~~~~~ (The alignment was probably OK, but it's nicer to avoid the warning anyway.) --- src/network/netdev/macsec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c index 15b5378f306..ccc37cded46 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -563,7 +563,7 @@ int config_parse_macsec_port( _cleanup_(macsec_receive_channel_free_or_set_invalidp) ReceiveChannel *c = NULL; MACsec *s = userdata; uint16_t port; - be16_t *dest; + void *dest; int r; assert(filename); @@ -600,7 +600,7 @@ int config_parse_macsec_port( return 0; } - *dest = htobe16(port); + unaligned_write_be16(dest, port); TAKE_PTR(b); TAKE_PTR(c); From b48ccda84f82470c449cbaeb1fca191b6c14bc6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 13 Apr 2019 11:57:42 +0200 Subject: [PATCH 2/2] sd-netlink: align table --- src/libsystemd/sd-netlink/generic-netlink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-netlink/generic-netlink.c b/src/libsystemd/sd-netlink/generic-netlink.c index 473d8670a93..5467f62ffa3 100644 --- a/src/libsystemd/sd-netlink/generic-netlink.c +++ b/src/libsystemd/sd-netlink/generic-netlink.c @@ -10,11 +10,11 @@ typedef struct { } genl_family; static const genl_family genl_families[] = { - [SD_GENL_ID_CTRL] = { .name = "", .version = 1 }, + [SD_GENL_ID_CTRL] = { .name = "", .version = 1 }, [SD_GENL_WIREGUARD] = { .name = "wireguard", .version = 1 }, - [SD_GENL_FOU] = { .name = "fou", .version = 1 }, - [SD_GENL_L2TP] = { .name = "l2tp", .version = 1}, - [SD_GENL_MACSEC] = { .name = "macsec", .version = 1}, + [SD_GENL_FOU] = { .name = "fou", .version = 1 }, + [SD_GENL_L2TP] = { .name = "l2tp", .version = 1 }, + [SD_GENL_MACSEC] = { .name = "macsec", .version = 1 }, }; int sd_genl_socket_open(sd_netlink **ret) {