From 458610429f077db352768ca6106a1ffad9c7673d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 12:59:29 +0900 Subject: [PATCH 01/11] tree-wide: fix typo --- man/systemd-cryptenroll.xml | 2 +- src/cryptenroll/cryptenroll-wipe.c | 2 +- src/cryptenroll/cryptenroll.c | 4 ++-- src/cryptsetup/cryptsetup-fido2.c | 2 +- src/cryptsetup/cryptsetup.c | 2 +- src/shared/firewall-util-nft.c | 11 +++++++---- src/test/test-mountpoint-util.c | 6 +++--- src/udev/dmi_memory_id/dmi_memory_id.c | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/man/systemd-cryptenroll.xml b/man/systemd-cryptenroll.xml index 17a546b256..93acdd02a5 100644 --- a/man/systemd-cryptenroll.xml +++ b/man/systemd-cryptenroll.xml @@ -246,7 +246,7 @@ systemd-cryptenroll /dev/sda1 --wipe-slot=tpm2 --tpm2-device=auto - The above command will enroll the TPM2 chip, and then wipe all previously crated TPM2 + The above command will enroll the TPM2 chip, and then wipe all previously created TPM2 enrollments on the LUKS2 volume, leaving only the newly created one. Combining wiping and enrollment may also be used to replace enrollments of different types, for example for changing from a PKCS#11 enrollment to a FIDO2 one: diff --git a/src/cryptenroll/cryptenroll-wipe.c b/src/cryptenroll/cryptenroll-wipe.c index 3c4a4e6acb..2f0f68fe86 100644 --- a/src/cryptenroll/cryptenroll-wipe.c +++ b/src/cryptenroll/cryptenroll-wipe.c @@ -258,7 +258,7 @@ static int find_slot_tokens(struct crypt_device *cd, Set *wipe_slots, Set *keep_ return log_oom(); } - /* And of course, als remember the tokens to remove. */ + /* And of course, also remember the tokens to remove. */ if (shall_wipe) if (set_put(wipe_tokens, INT_TO_PTR(token)) < 0) return log_oom(); diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index fb41bbe4aa..b28dbcd665 100644 --- a/src/cryptenroll/cryptenroll.c +++ b/src/cryptenroll/cryptenroll.c @@ -90,7 +90,7 @@ static int help(void) { " --tpm2-device=PATH\n" " Enroll a TPM2 device\n" " --tpm2-pcrs=PCR1,PCR2,PCR3,…\n" - " Specifiy TPM2 PCRs to seal against\n" + " Specify TPM2 PCRs to seal against\n" " --wipe-slot=SLOT1,SLOT2,…\n" " Wipe specified slots\n" "\nSee the %s for details.\n" @@ -390,7 +390,7 @@ static int prepare_luks( password, strlen(password)); if (r < 0) - return log_error_errno(r, "Password from environent variable $PASSWORD did not work."); + return log_error_errno(r, "Password from environment variable $PASSWORD did not work."); } else { AskPasswordFlags ask_password_flags = ASK_PASSWORD_PUSH_CACHE|ASK_PASSWORD_ACCEPT_CACHED; _cleanup_free_ char *question = NULL, *disk_path = NULL; diff --git a/src/cryptsetup/cryptsetup-fido2.c b/src/cryptsetup/cryptsetup-fido2.c index 5edda0cf9d..cc18f83658 100644 --- a/src/cryptsetup/cryptsetup-fido2.c +++ b/src/cryptsetup/cryptsetup-fido2.c @@ -90,7 +90,7 @@ int acquire_fido2_key( r = ask_password_auto("Please enter security token PIN:", "drive-harddisk", NULL, "fido2-pin", until, flags, &pins); if (r < 0) - return log_error_errno(r, "Failed to ask for user pasword: %m"); + return log_error_errno(r, "Failed to ask for user password: %m"); flags &= ~ASK_PASSWORD_ACCEPT_CACHED; } diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 538cda9c86..7b21a7457a 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1035,7 +1035,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2( &keyslot, &token); if (r == -ENXIO) { - /* No futher TPM2 tokens found in the LUKS2 header.*/ + /* No further TPM2 tokens found in the LUKS2 header.*/ if (found_some) return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), "No TPM2 metadata matching the current system state found in LUKS2 header, falling back to traditional unlocking."); diff --git a/src/shared/firewall-util-nft.c b/src/shared/firewall-util-nft.c index 69bc233164..d48811a58a 100644 --- a/src/shared/firewall-util-nft.c +++ b/src/shared/firewall-util-nft.c @@ -314,12 +314,13 @@ static int nfnl_add_expr_masq(sd_netlink_message *m) { return sd_netlink_message_close_container(m); /* NFTA_LIST_ELEM */ } -/* -t nat -A POSTROUTING -p protocol -s source/pflen -o out_interface -d destionation/pflen -j MASQUERADE */ static int sd_nfnl_message_new_masq_rule(sd_netlink *nfnl, sd_netlink_message **ret, int family, const char *chain) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL; int r; + /* -t nat -A POSTROUTING -p protocol -s source/pflen -o out_interface -d destination/pflen -j MASQUERADE */ + r = sd_nfnl_nft_message_new_rule(nfnl, &m, family, NFT_SYSTEMD_TABLE_NAME, chain); if (r < 0) return r; @@ -351,7 +352,6 @@ static int sd_nfnl_message_new_masq_rule(sd_netlink *nfnl, sd_netlink_message ** return 0; } -/* -t nat -A PREROUTING -p protocol --dport local_port -i in_interface -s source/pflen -d destionation/pflen -j DNAT --to-destination remote_addr:remote_port */ static int sd_nfnl_message_new_dnat_rule_pre(sd_netlink *nfnl, sd_netlink_message **ret, int family, const char *chain) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL; @@ -359,6 +359,9 @@ static int sd_nfnl_message_new_dnat_rule_pre(sd_netlink *nfnl, sd_netlink_messag uint32_t local = RTN_LOCAL; int r; + /* -t nat -A PREROUTING -p protocol --dport local_port -i in_interface -s source/pflen + * -d destination/pflen -j DNAT --to-destination remote_addr:remote_port */ + r = sd_nfnl_nft_message_new_rule(nfnl, &m, family, NFT_SYSTEMD_TABLE_NAME, chain); if (r < 0) return r; @@ -471,7 +474,7 @@ static int sd_nfnl_message_new_dnat_rule_out(sd_netlink *nfnl, sd_netlink_messag return r; /* 4th statement: dnat connection to address/port retrieved by the - * preceeding expression. */ + * preceding expression. */ proto_reg = NFT_REG32_02; r = nfnl_add_expr_dnat(m, family, NFT_REG32_01, proto_reg); if (r < 0) @@ -788,7 +791,7 @@ static int nft_message_add_setelem_iprange(sd_netlink_message *m, * In the nftables case, everything gets removed. The next add operation * will yield -ENOENT. * - * If we see -ENOENT on add, replay the inital table setup. + * If we see -ENOENT on add, replay the initial table setup. * If that works, re-do the add operation. * * Note that this doesn't protect against external sabotage such as a diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c index 47fde5cb2c..125e5ac9fa 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -280,9 +280,9 @@ static void test_fd_is_mount_point(void) { assert_se(fd_is_mount_point(fd, "proc", 0) > 0); assert_se(fd_is_mount_point(fd, "proc/", 0) > 0); - /* /root's entire raison d'etre is to be on the root file system (i.e. not in /home/ which might be - * split off), so that the user can always log in, so it cannot be a mount point unless the system is - * borked. Let's allow for it to be missing though. */ + /* /root's entire reason for being is to be on the root file system (i.e. not in /home/ which + * might be split off), so that the user can always log in, so it cannot be a mount point unless + * the system is borked. Let's allow for it to be missing though. */ assert_se(IN_SET(fd_is_mount_point(fd, "root", 0), -ENOENT, 0)); assert_se(IN_SET(fd_is_mount_point(fd, "root/", 0), -ENOENT, 0)); } diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c index dfb243483c..5529daa602 100644 --- a/src/udev/dmi_memory_id/dmi_memory_id.c +++ b/src/udev/dmi_memory_id/dmi_memory_id.c @@ -572,7 +572,7 @@ static int dmi_table(int64_t base, uint32_t len, uint16_t num, const char *devme /* * When reading from sysfs or from a dump file, the file may be - * shorter than announced. For SMBIOS v3 this is expcted, as we + * shorter than announced. For SMBIOS v3 this is expected, as we * only know the maximum table size, not the actual table size. * For older implementations (and for SMBIOS v3 too), this * would be the result of the kernel truncating the table on @@ -599,7 +599,7 @@ static int smbios3_decode(const uint8_t *buf, const char *devmem, bool no_file_o buf[0x06], 0x18U); if (!verify_checksum(buf, buf[0x06])) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Faied to verify checksum."); + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to verify checksum."); offset = QWORD(buf + 0x10); if (!no_file_offset && (offset >> 32) != 0 && sizeof(int64_t) < 8) From 517fdd61ed6d4b7d5f5d2ef77b417d2b8f5b96cb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:00:57 +0900 Subject: [PATCH 02/11] network: move variable declaration --- src/network/networkd-ndisc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index 32b8482527..0d21089d5c 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -840,9 +840,9 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) { return log_link_error_errno(link, r, "Failed to get gateway address from RA: %m"); if (link_has_ipv6_address(link, &gateway.in6) == 0) { - _cleanup_free_ char *buf = NULL; - if (DEBUG_LOGGING) { + _cleanup_free_ char *buf = NULL; + (void) in_addr_to_string(AF_INET6, &gateway, &buf); log_link_debug(link, "Advertised route gateway, %s, is local to the link, ignoring route", strnull(buf)); } From ec87f63c0ecadfdc4b5d5b40e451f7b3b6e2000f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:05:19 +0900 Subject: [PATCH 03/11] meson: add missing headers --- src/basic/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/basic/meson.build b/src/basic/meson.build index 8f51c76dda..f2d17155de 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -114,7 +114,11 @@ basic_sources = files(''' linux/libc-compat.h linux/loadavg.h linux/netdevice.h + linux/netfilter/nf_tables.h + linux/netfilter/nfnetlink.h linux/netlink.h + linux/nexthop.h + linux/pkt_sched.h linux/rtnetlink.h linux/wireguard.h list.h From 2d1ad72456b9eea06cc99632d64a4c785dabaaec Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:11:06 +0900 Subject: [PATCH 04/11] sd-netlink: replace *messages[] -> **messages --- src/libsystemd/sd-netlink/netlink-internal.h | 2 +- src/libsystemd/sd-netlink/netlink-socket.c | 2 +- src/libsystemd/sd-netlink/sd-netlink.c | 2 +- src/systemd/sd-netlink.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/sd-netlink/netlink-internal.h index 2845700ffb..efd0cf9335 100644 --- a/src/libsystemd/sd-netlink/netlink-internal.h +++ b/src/libsystemd/sd-netlink/netlink-internal.h @@ -139,7 +139,7 @@ int socket_bind(sd_netlink *nl); int socket_broadcast_group_ref(sd_netlink *nl, unsigned group); int socket_broadcast_group_unref(sd_netlink *nl, unsigned group); int socket_write_message(sd_netlink *nl, sd_netlink_message *m); -int socket_writev_message(sd_netlink *nl, sd_netlink_message *m[], size_t msgcount); +int socket_writev_message(sd_netlink *nl, sd_netlink_message **m, size_t msgcount); int socket_read_message(sd_netlink *nl); int rtnl_rqueue_make_room(sd_netlink *rtnl); diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index a1a839f57a..f1d24a6989 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -238,7 +238,7 @@ int socket_write_message(sd_netlink *nl, sd_netlink_message *m) { return k; } -int socket_writev_message(sd_netlink *nl, sd_netlink_message *m[], size_t msgcount) { +int socket_writev_message(sd_netlink *nl, sd_netlink_message **m, size_t msgcount) { _cleanup_free_ struct iovec *iovs = NULL; ssize_t k; size_t i; diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index ceb8333cbe..8a419c5ed2 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -227,7 +227,7 @@ int sd_netlink_send(sd_netlink *nl, } int sd_netlink_sendv(sd_netlink *nl, - sd_netlink_message *messages[], + sd_netlink_message **messages, size_t msgcount, uint32_t **ret_serial) { _cleanup_free_ uint32_t *serials = NULL; diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h index b688ce6674..b28d5d7c16 100644 --- a/src/systemd/sd-netlink.h +++ b/src/systemd/sd-netlink.h @@ -60,7 +60,7 @@ sd_netlink *sd_netlink_ref(sd_netlink *nl); sd_netlink *sd_netlink_unref(sd_netlink *nl); int sd_netlink_send(sd_netlink *nl, sd_netlink_message *message, uint32_t *serial); -int sd_netlink_sendv(sd_netlink *nl, sd_netlink_message *messages[], size_t msgcnt, uint32_t **ret_serial); +int sd_netlink_sendv(sd_netlink *nl, sd_netlink_message **messages, size_t msgcnt, uint32_t **ret_serial); int sd_netlink_call_async(sd_netlink *nl, sd_netlink_slot **ret_slot, sd_netlink_message *message, sd_netlink_message_handler_t callback, sd_netlink_destroy_t destoy_callback, void *userdata, uint64_t usec, const char *description); From f6dab7489e17d8cb6758c07fd2cecf42c6b5b9a0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:12:09 +0900 Subject: [PATCH 05/11] sd-netlink: add several assertions --- src/libsystemd/sd-netlink/netlink-socket.c | 3 ++- src/libsystemd/sd-netlink/sd-netlink.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index f1d24a6989..9e8dff1a72 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -244,7 +244,8 @@ int socket_writev_message(sd_netlink *nl, sd_netlink_message **m, size_t msgcoun size_t i; assert(nl); - assert(msgcount); + assert(m); + assert(msgcount > 0); iovs = new0(struct iovec, msgcount); if (!iovs) diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index 8a419c5ed2..db9fcd79dd 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -237,6 +237,7 @@ int sd_netlink_sendv(sd_netlink *nl, assert_return(nl, -EINVAL); assert_return(!rtnl_pid_changed(nl), -ECHILD); assert_return(messages, -EINVAL); + assert_return(msgcount > 0, -EINVAL); if (ret_serial) { serials = new0(uint32_t, msgcount); From faa0d69c6c458c0b44abfc1dd17df52a7bb6bd6c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:14:08 +0900 Subject: [PATCH 06/11] netlink: use whitespace instead of tab --- src/libsystemd/sd-netlink/netlink-types.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c index 167433337f..2b32e52f31 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -1467,7 +1467,7 @@ static const NLTypeSystem nfnl_nft_rule_expr_type_system = { static const NLType nfnl_nft_rule_types[] = { [NFTA_RULE_TABLE] = { .type = NETLINK_TYPE_STRING, .size = NFT_TABLE_MAXNAMELEN - 1 }, [NFTA_RULE_CHAIN] = { .type = NETLINK_TYPE_STRING, .size = NFT_TABLE_MAXNAMELEN - 1 }, - [NFTA_RULE_EXPRESSIONS] = { .type = NETLINK_TYPE_NESTED, .type_system = &nfnl_nft_rule_expr_type_system } + [NFTA_RULE_EXPRESSIONS] = { .type = NETLINK_TYPE_NESTED, .type_system = &nfnl_nft_rule_expr_type_system } }; static const NLTypeSystem nfnl_nft_rule_type_system = { From a73f0807270a2c94c5a7974d34f5fe1be119d0e1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:17:49 +0900 Subject: [PATCH 07/11] netlink: drop unnecessary error handling --- src/libsystemd/sd-netlink/nfnl-message.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-netlink/nfnl-message.c b/src/libsystemd/sd-netlink/nfnl-message.c index d7bcbf8ba8..f02fc6788a 100644 --- a/src/libsystemd/sd-netlink/nfnl-message.c +++ b/src/libsystemd/sd-netlink/nfnl-message.c @@ -122,21 +122,18 @@ int sd_nfnl_nft_message_new_basechain(sd_netlink *nfnl, sd_netlink_message **ret r = sd_netlink_message_append_u32(m, NFTA_HOOK_HOOKNUM, htobe32(hook)); if (r < 0) - goto cancel; + return r; r = sd_netlink_message_append_u32(m, NFTA_HOOK_PRIORITY, htobe32(prio)); if (r < 0) - goto cancel; + return r; r = sd_netlink_message_close_container(m); if (r < 0) - goto cancel; + return r; *ret = TAKE_PTR(m); return 0; -cancel: - sd_netlink_message_cancel_array(m); - return r; } int sd_nfnl_nft_message_del_table(sd_netlink *nfnl, sd_netlink_message **ret, From ce9dc1fd8b2d3f7074a066584c81b0cfc6e99242 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:18:37 +0900 Subject: [PATCH 08/11] netlink: fix indentation --- src/libsystemd/sd-netlink/nfnl-message.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-netlink/nfnl-message.c b/src/libsystemd/sd-netlink/nfnl-message.c index f02fc6788a..6c11ae6ee5 100644 --- a/src/libsystemd/sd-netlink/nfnl-message.c +++ b/src/libsystemd/sd-netlink/nfnl-message.c @@ -240,6 +240,7 @@ int sd_nfnl_nft_message_new_setelems_begin(sd_netlink *nfnl, sd_netlink_message r = sd_netlink_message_open_container(m, NFTA_SET_ELEM_LIST_ELEMENTS); if (r < 0) return r; + *ret = TAKE_PTR(m); return r; } @@ -264,6 +265,7 @@ int sd_nfnl_nft_message_del_setelems_begin(sd_netlink *nfnl, sd_netlink_message r = sd_netlink_message_open_container(m, NFTA_SET_ELEM_LIST_ELEMENTS); if (r < 0) return r; + *ret = TAKE_PTR(m); return r; } @@ -280,10 +282,9 @@ static int sd_nfnl_add_data(sd_netlink_message *m, uint16_t attr, const void *da return sd_netlink_message_close_container(m); /* attr */ } -int sd_nfnl_nft_message_add_setelem(sd_netlink_message *m, - uint32_t num, - const void *key, uint32_t klen, - const void *data, uint32_t dlen) { +int sd_nfnl_nft_message_add_setelem(sd_netlink_message *m, uint32_t num, + const void *key, uint32_t klen, + const void *data, uint32_t dlen) { int r; r = sd_netlink_message_open_array(m, num); From 479667c497083a2b967be76cc6d766befb33269f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:21:07 +0900 Subject: [PATCH 09/11] nspawn: sort headers --- src/nspawn/nspawn-expose-ports.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nspawn/nspawn-expose-ports.h b/src/nspawn/nspawn-expose-ports.h index c1677cb61b..8cfabd9797 100644 --- a/src/nspawn/nspawn-expose-ports.h +++ b/src/nspawn/nspawn-expose-ports.h @@ -3,11 +3,10 @@ #include -#include "firewall-util.h" - #include "sd-event.h" #include "sd-netlink.h" +#include "firewall-util.h" #include "in-addr-util.h" #include "list.h" From 8940baac4d9b2632603947e3caffc826b62472a0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:24:30 +0900 Subject: [PATCH 10/11] meson: sort files --- src/shared/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/meson.build b/src/shared/meson.build index ec4f3e882a..ac78c9f818 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -101,10 +101,10 @@ shared_sources = files(''' fdset.h fileio-label.c fileio-label.h - firewall-util.c firewall-util-nft.c - firewall-util.h firewall-util-private.h + firewall-util.c + firewall-util.h format-table.c format-table.h fsck-util.h From eca248640b97df2a2857e5ebd569cc40c6683f74 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 13:26:44 +0900 Subject: [PATCH 11/11] netlink: fix size of fib rule messages --- src/libsystemd/sd-netlink/netlink-types.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c index 2b32e52f31..f5e5fdf3af 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -1027,9 +1027,9 @@ static const NLType rtnl_types[] = { [RTM_NEWADDRLABEL] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_addrlabel_type_system, .size = sizeof(struct ifaddrlblmsg) }, [RTM_DELADDRLABEL] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_addrlabel_type_system, .size = sizeof(struct ifaddrlblmsg) }, [RTM_GETADDRLABEL] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_addrlabel_type_system, .size = sizeof(struct ifaddrlblmsg) }, - [RTM_NEWRULE] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_routing_policy_rule_type_system, .size = sizeof(struct rtmsg) }, - [RTM_DELRULE] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_routing_policy_rule_type_system, .size = sizeof(struct rtmsg) }, - [RTM_GETRULE] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_routing_policy_rule_type_system, .size = sizeof(struct rtmsg) }, + [RTM_NEWRULE] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_routing_policy_rule_type_system, .size = sizeof(struct fib_rule_hdr) }, + [RTM_DELRULE] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_routing_policy_rule_type_system, .size = sizeof(struct fib_rule_hdr) }, + [RTM_GETRULE] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_routing_policy_rule_type_system, .size = sizeof(struct fib_rule_hdr) }, [RTM_NEWNEXTHOP] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_nexthop_type_system, .size = sizeof(struct nhmsg) }, [RTM_DELNEXTHOP] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_nexthop_type_system, .size = sizeof(struct nhmsg) }, [RTM_GETNEXTHOP] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_nexthop_type_system, .size = sizeof(struct nhmsg) },