Skip to contentSkip to conversation

systemd: Fix static neighbor creation in networkd

PATCH In review William A. Kennington III 2 participants 5 messages May 17, 2021 – May 18, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 systemd: Fix static neighbor creation in networkd

Backport a patch to fix the creation of static neighbors.

---
 ...or-Always-add-neighbors-with-replace.patch | 50 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_247.6.bb    |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +50 -0
new file mode 100644
index 0000000000..5593c3f479
@@ -0,0 +1,50 @@
+From faa0f758bc2f194d63bbed6e7f91df176f594a06 Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III" <[email protected]>
+Date: Tue, 27 Apr 2021 01:25:58 -0700
+Subject: [PATCH] network: neighbor: Always add neighbors with replace
+
+We were duplicating setting flags for the message and a combination of
+NLM_F_APPEND and NLM_F_CREATE which does not make sense. We should have
+been using NLM_F_REPLACE and NLM_F_CREATE since the kernel can
+dynamically create neighbors prior to us adding an entry. Otherwise, we
+can end up with cases where the message will time out after ~25s even
+though the neighbor still gets added. This delays the rest of the setup
+of the interface even though the error is ultimately ignored.
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/commit/192a9d95ea3e058afd824d38a9cea16ad0a84a57]
+---
+ src/libsystemd/sd-netlink/rtnl-message.c | 2 +-
+ src/network/networkd-neighbor.c          | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c
+index 4cabbabba6..c9d0c9b1e7 100644
+--- a/src/libsystemd/sd-netlink/rtnl-message.c
++++ b/src/libsystemd/sd-netlink/rtnl-message.c
+@@ -445,7 +445,7 @@ int sd_rtnl_message_new_neigh(sd_netlink *rtnl, sd_netlink_message **ret, uint16
+                 return r;
+ 
+         if (nlmsg_type == RTM_NEWNEIGH)
+-                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_APPEND;
++                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
+ 
+         ndm = NLMSG_DATA((*ret)->hdr);
+ 
+diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c
+index c805d52cf3..adce055009 100644
+--- a/src/network/networkd-neighbor.c
++++ b/src/network/networkd-neighbor.c
+@@ -259,10 +259,6 @@ static int neighbor_configure(Neighbor *neighbor, Link *link) {
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not set state: %m");
+ 
+-        r = sd_netlink_message_set_flags(req, NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE | NLM_F_REPLACE);
+-        if (r < 0)
+-                return log_link_error_errno(link, r, "Could not set flags: %m");
+-
+         r = sd_netlink_message_append_data(req, NDA_LLADDR, &neighbor->lladdr, neighbor->lladdr_size);
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not append NDA_LLADDR attribute: %m");
+-- 
+2.31.1.498.g6c1eba8ee3d-goog
+
meta/recipes-core/systemd/systemd_247.6.bb +1 -0
index ce6ac7ebaa..fb4acf2d37 100644
@@ -27,6 +27,7 @@ SRC_URI += "file://touchscreen.rules \
            file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \
            file://0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch \
            file://0001-analyze-resolve-executable-path-if-it-is-relative.patch \
+           file://0001-network-neighbor-Always-add-neighbors-with-replace.patch \
            "
 
 # patches needed by musl
Signature · 1 line
2.31.1.751.gd2f1c929bd-goog
#1 lore raw

PATCH 2/2 systemd: Fix networkd failing links with loopback RAs

Backport a patch to situations where the current node receives an RA packet from itself, which triggers systemd-networkd to put the link into a failed state which turns off internal RA functionality.

---
 ...le-ignoring-ll-gateway-being-link-ll.patch | 68 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_247.6.bb    |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-networkd-handle-ignoring-ll-gateway-being-link-ll.patch
meta/recipes-core/systemd/systemd/0001-networkd-handle-ignoring-ll-gateway-being-link-ll.patch new file +68 -0
new file mode 100644
index 0000000000..47e81a6c38
@@ -0,0 +1,68 @@
+From 40c6396bfd1e83f80dde31f4886bb1dbf155012d Mon Sep 17 00:00:00 2001
+From: Devon Pringle <[email protected]>
+Date: Mon, 14 Dec 2020 14:22:18 +1000
+Subject: [PATCH] networkd: handle ignoring ll gateway being link ll
+
+In the event where network discovery gets a route with the gateway being
+the interfaces local link address, networkd will fail the interface.
+
+systemd-networkd[44319]: br_lan: Configuring route: dst: fdcd:41a4:5559:ec03::/64, src: n/a, gw: fe80::e4da:7eff:fe77:5c5e, prefsrc: n/a, scope: global, table: main, proto: ra, type: unicast
+systemd-networkd[44319]: br_lan: Could not set NDisc route or address: Gateway can not be a local address. Invalid argument
+systemd-networkd[44319]: br_lan: Failed
+systemd-networkd[44319]: br_lan: State changed: configuring -> failed
+
+This patch, instead of allowing the interface to fail, will instead log
+the event and skip setting the route.
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/commit/221019166f315252304b3459902ead613b905de5]
+---
+ src/network/networkd-ndisc.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
+index d2aa3db175..41591900e9 100644
+--- a/src/network/networkd-ndisc.c
++++ b/src/network/networkd-ndisc.c
+@@ -820,7 +820,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
+ 
+ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) {
+         _cleanup_(route_freep) Route *route = NULL;
+-        struct in6_addr gateway;
++        union in_addr_union gateway;
+         uint32_t lifetime;
+         unsigned preference, prefixlen;
+         usec_t time_now;
+@@ -835,10 +835,20 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) {
+         if (lifetime == 0)
+                 return 0;
+ 
+-        r = sd_ndisc_router_get_address(rt, &gateway);
++        r = sd_ndisc_router_get_address(rt, &gateway.in6);
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Failed to get gateway address from RA: %m");
+ 
++        if (address_exists(link, AF_INET6, &gateway)) {
++                _cleanup_free_ char *buf = NULL;
++
++                if (DEBUG_LOGGING) {
++                        (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));
++                }
++                return 0;
++        }
++
+         r = sd_ndisc_router_route_get_prefixlen(rt, &prefixlen);
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Failed to get route prefix length: %m");
+@@ -860,7 +870,7 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) {
+         route->priority = link->network->dhcp6_route_metric;
+         route->protocol = RTPROT_RA;
+         route->pref = preference;
+-        route->gw.in6 = gateway;
++        route->gw.in6 = gateway.in6;
+         route->gw_family = AF_INET6;
+         route->dst_prefixlen = prefixlen;
+         route->lifetime = time_now + lifetime * USEC_PER_SEC;
+-- 
+2.31.1.607.g51e8a6a459-goog
+
meta/recipes-core/systemd/systemd_247.6.bb +1 -0
index fb4acf2d37..dc04908922 100644
@@ -28,6 +28,7 @@ SRC_URI += "file://touchscreen.rules \
            file://0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch \
            file://0001-analyze-resolve-executable-path-if-it-is-relative.patch \
            file://0001-network-neighbor-Always-add-neighbors-with-replace.patch \
+           file://0001-networkd-handle-ignoring-ll-gateway-being-link-ll.patch \
            "
 
 # patches needed by musl
Signature · 1 line
2.31.1.751.gd2f1c929bd-goog
#2 lore raw
In reply to William A. Kennington III

At this point it might be better to update systemd itself to 248?

Alex

Quoted 104 lines · William A. Kennington III via lists.openembedded.org

Backport a patch to fix the creation of static neighbors.

---
 ...or-Always-add-neighbors-with-replace.patch | 50 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_247.6.bb    |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

diff --git a/meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch b/meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file mode 100644
index 0000000000..5593c3f479
--- /dev/null
+++
b/meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +14 -0
@@ -0,0 +1,50 @@
+From faa0f758bc2f194d63bbed6e7f91df176f594a06 Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III" <[email protected]>
+Date: Tue, 27 Apr 2021 01:25:58 -0700
+Subject: [PATCH] network: neighbor: Always add neighbors with replace
+
+We were duplicating setting flags for the message and a combination of
+NLM_F_APPEND and NLM_F_CREATE which does not make sense. We should have
+been using NLM_F_REPLACE and NLM_F_CREATE since the kernel can
+dynamically create neighbors prior to us adding an entry. Otherwise, we
+can end up with cases where the message will time out after ~25s even
+though the neighbor still gets added. This delays the rest of the setup
+of the interface even though the error is ultimately ignored.
+
+Upstream-Status: Backport [

https://github.com/systemd/systemd/commit/192a9d95ea3e058afd824d38a9cea16ad0a84a57
]

+---
+ src/libsystemd/sd-netlink/rtnl-message.c | 2 +-
+ src/network/networkd-neighbor.c          | 4 ----

+ 2 files changed, 1 insertion(+), 5 deletions(-)

(quoted diff) +2 -0
+
+diff --git a/src/libsystemd/sd-netlink/rtnl-message.c

b/src/libsystemd/sd-netlink/rtnl-message.c
+index 4cabbabba6..c9d0c9b1e7 100644
+--- a/src/libsystemd/sd-netlink/rtnl-message.c
++++ b/src/libsystemd/sd-netlink/rtnl-message.c
+@@ -445,7 +445,7 @@ int sd_rtnl_message_new_neigh(sd_netlink *rtnl, sd_netlink_message **ret, uint16

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +9 -0
+                 return r;
+
+         if (nlmsg_type == RTM_NEWNEIGH)
+-                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_APPEND;
++                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
+
+         ndm = NLMSG_DATA((*ret)->hdr);
+
+diff --git a/src/network/networkd-neighbor.c

b/src/network/networkd-neighbor.c
+index c805d52cf3..adce055009 100644
+--- a/src/network/networkd-neighbor.c
++++ b/src/network/networkd-neighbor.c
+@@ -259,10 +259,6 @@ static int neighbor_configure(Neighbor *neighbor, Link *link) {

(quoted diff) +2 -0
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not set

state: %m");
+

+-        r = sd_netlink_message_set_flags(req, NLM_F_REQUEST | NLM_F_ACK
| NLM_F_CREATE | NLM_F_REPLACE);
+-        if (r < 0)
+-                return log_link_error_errno(link, r, "Could not set
flags: %m");
+-
+         r = sd_netlink_message_append_data(req, NDA_LLADDR,

&neighbor->lladdr, neighbor->lladdr_size);

(quoted diff) +2 -0
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not append

NDA_LLADDR attribute: %m");
+--
+2.31.1.498.g6c1eba8ee3d-goog

(quoted diff) +1 -0
+
meta/recipes-core/systemd/systemd_247.6.bb +1 -0
index ce6ac7ebaa..fb4acf2d37 100644
@@ -27,6 +27,7 @@ SRC_URI += "file://touchscreen.rules \
 
 file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \
 
 file://0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch \
 
 file://0001-analyze-resolve-executable-path-if-it-is-relative.patch \
+
 file://0001-network-neighbor-Always-add-neighbors-with-replace.patch \
            "
 # patches needed by musl
--
2.31.1.751.gd2f1c929bd-goog
#3 lore raw

It would be nice, but it was non-trivial so I opted to go this path first. These patches can be dropped once v248.2 is brought in.

Quoted 90 lines · Alexander Kanavin

At this point it might be better to update systemd itself to 248?

Alex

Quoted 84 lines · William A. Kennington III via lists.openembedded.org

Backport a patch to fix the creation of static neighbors.

---
 ...or-Always-add-neighbors-with-replace.patch | 50 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_247.6.bb    |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +50 -0
new file mode 100644
index 0000000000..5593c3f479
@@ -0,0 +1,50 @@
+From faa0f758bc2f194d63bbed6e7f91df176f594a06 Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III" <[email protected]>
+Date: Tue, 27 Apr 2021 01:25:58 -0700
+Subject: [PATCH] network: neighbor: Always add neighbors with replace
+
+We were duplicating setting flags for the message and a combination of
+NLM_F_APPEND and NLM_F_CREATE which does not make sense. We should have
+been using NLM_F_REPLACE and NLM_F_CREATE since the kernel can
+dynamically create neighbors prior to us adding an entry. Otherwise, we
+can end up with cases where the message will time out after ~25s even
+though the neighbor still gets added. This delays the rest of the setup
+of the interface even though the error is ultimately ignored.
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/commit/192a9d95ea3e058afd824d38a9cea16ad0a84a57]
+---
+ src/libsystemd/sd-netlink/rtnl-message.c | 2 +-
+ src/network/networkd-neighbor.c          | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c
+index 4cabbabba6..c9d0c9b1e7 100644
+--- a/src/libsystemd/sd-netlink/rtnl-message.c
++++ b/src/libsystemd/sd-netlink/rtnl-message.c
+@@ -445,7 +445,7 @@ int sd_rtnl_message_new_neigh(sd_netlink *rtnl, sd_netlink_message **ret, uint16
+                 return r;
+
+         if (nlmsg_type == RTM_NEWNEIGH)
+-                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_APPEND;
++                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
+
+         ndm = NLMSG_DATA((*ret)->hdr);
+
+diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c
+index c805d52cf3..adce055009 100644
+--- a/src/network/networkd-neighbor.c
++++ b/src/network/networkd-neighbor.c
+@@ -259,10 +259,6 @@ static int neighbor_configure(Neighbor *neighbor, Link *link) {
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not set state: %m");
+
+-        r = sd_netlink_message_set_flags(req, NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE | NLM_F_REPLACE);
+-        if (r < 0)
+-                return log_link_error_errno(link, r, "Could not set flags: %m");
+-
+         r = sd_netlink_message_append_data(req, NDA_LLADDR, &neighbor->lladdr, neighbor->lladdr_size);
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not append NDA_LLADDR attribute: %m");
+--
+2.31.1.498.g6c1eba8ee3d-goog
+
meta/recipes-core/systemd/systemd_247.6.bb +1 -1
index ce6ac7ebaa..fb4acf2d37 100644
@@ -27,6 +27,7 @@ SRC_URI += "file://touchscreen.rules \
            file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \
            file://0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch \
            file://0001-analyze-resolve-executable-path-if-it-is-relative.patch \
+           file://0001-network-neighbor-Always-add-neighbors-with-replace.patch \
            "
 
 # patches needed by musl
--

2.31.1.751.gd2f1c929bd-goog

#4 lore raw

Yes it's non-trivial, but would be very appreciated. On the other hand, backporting these fixes (which are not about security, and can be applied in your private layer via bbappend) removes all incentive for you to work on the upgrade and it becomes someone else's problem.

Alex

Quoted 119 lines · William Kennington

It would be nice, but it was non-trivial so I opted to go this path first. These patches can be dropped once v248.2 is brought in.

Quoted 6 lines · Alexander Kanavin

At this point it might be better to update systemd itself to 248?

Alex

On Tue, 18 May 2021 at 00:51, William A. Kennington III via

Quoted 9 lines · lists.openembedded.org
Quoted 9 lines

Backport a patch to fix the creation of static neighbors.

---
 ...or-Always-add-neighbors-with-replace.patch | 50 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_247.6.bb    |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 2 lines
Quoted 2 lines

diff --git

a/meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch b/meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 4 lines
Quoted 4 lines

new file mode 100644
index 0000000000..5593c3f479
--- /dev/null
+++

b/meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 7 lines
Quoted 7 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +6 -0
@@ -0,0 +1,50 @@
+From faa0f758bc2f194d63bbed6e7f91df176f594a06 Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III" <[email protected]>
+Date: Tue, 27 Apr 2021 01:25:58 -0700
+Subject: [PATCH] network: neighbor: Always add neighbors with replace
+
+We were duplicating setting flags for the message and a combination of
Quoted 8 lines

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 8 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +8 -0
+NLM_F_APPEND and NLM_F_CREATE which does not make sense. We should have
+been using NLM_F_REPLACE and NLM_F_CREATE since the kernel can
+dynamically create neighbors prior to us adding an entry. Otherwise, we
+can end up with cases where the message will time out after ~25s even
+though the neighbor still gets added. This delays the rest of the setup
+of the interface even though the error is ultimately ignored.
+
+Upstream-Status: Backport [

https://github.com/systemd/systemd/commit/192a9d95ea3e058afd824d38a9cea16ad0a84a57
]

Quoted 6 lines

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 6 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +6 -0
+---
+ src/libsystemd/sd-netlink/rtnl-message.c | 2 +-
+ src/network/networkd-neighbor.c          | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/libsystemd/sd-netlink/rtnl-message.c

b/src/libsystemd/sd-netlink/rtnl-message.c

Quoted 4 lines

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 4 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +4 -0
+index 4cabbabba6..c9d0c9b1e7 100644
+--- a/src/libsystemd/sd-netlink/rtnl-message.c
++++ b/src/libsystemd/sd-netlink/rtnl-message.c
+@@ -445,7 +445,7 @@ int sd_rtnl_message_new_neigh(sd_netlink *rtnl,

sd_netlink_message **ret, uint16

Quoted 4 lines

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 4 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +4 -0
+                 return r;
+
+         if (nlmsg_type == RTM_NEWNEIGH)
+-                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE |

NLM_F_APPEND;

Quoted 1 line

Review line 29

Quoted 1 line
(quoted diff) +1 -0
++                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE |

NLM_F_REPLACE;

Quoted 4 lines

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 4 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +4 -0
+
+         ndm = NLMSG_DATA((*ret)->hdr);
+
+diff --git a/src/network/networkd-neighbor.c

b/src/network/networkd-neighbor.c

Quoted 4 lines

meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch

Quoted 4 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +4 -0
+index c805d52cf3..adce055009 100644
+--- a/src/network/networkd-neighbor.c
++++ b/src/network/networkd-neighbor.c
+@@ -259,10 +259,6 @@ static int neighbor_configure(Neighbor *neighbor,

Link *link) {

Quoted 2 lines

Review line 39

Quoted 2 lines
(quoted diff) +2 -0
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not set

state: %m");

Quoted 2 lines

Review line 41

Quoted 2 lines
(quoted diff) +2 -0
+
+-        r = sd_netlink_message_set_flags(req, NLM_F_REQUEST |

NLM_F_ACK | NLM_F_CREATE | NLM_F_REPLACE);

Quoted 2 lines

Review line 43

Quoted 2 lines
(quoted diff) +2 -0
+-        if (r < 0)
+-                return log_link_error_errno(link, r, "Could not set

flags: %m");

Quoted 2 lines

Review line 45

Quoted 2 lines
(quoted diff) +2 -0
+-
+         r = sd_netlink_message_append_data(req, NDA_LLADDR,

&neighbor->lladdr, neighbor->lladdr_size);

Quoted 2 lines

Review line 47

Quoted 2 lines
(quoted diff) +2 -0
+         if (r < 0)
+                 return log_link_error_errno(link, r, "Could not

append NDA_LLADDR attribute: %m");

Quoted 4 lines

Review

Quoted 4 lines
meta/recipes-core/systemd/systemd/0001-network-neighbor-Always-add-neighbors-with-replace.patch new file +3 -0
+--
+2.31.1.498.g6c1eba8ee3d-goog
+
(quoted diff) +0 -0

b/meta/recipes-core/systemd/systemd_247.6.bb

Quoted 5 lines

meta/recipes-core/systemd/systemd_247.6.bb SRC_URI += "file://touchscreen.rules \ · line 27

Quoted 5 lines

index ce6ac7ebaa..fb4acf2d37 100644

meta/recipes-core/systemd/systemd_247.6.bb +0 -0
@@ -27,6 +27,7 @@ SRC_URI += "file://touchscreen.rules \
 

file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \

Quoted 1 line
Quoted 1 line

file://0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch \

Quoted 1 line
Quoted 1 line

file://0001-analyze-resolve-executable-path-if-it-is-relative.patch \

Quoted 1 line
Quoted 1 line

+

file://0001-network-neighbor-Always-add-neighbors-with-replace.patch \

Quoted 9 lines
Quoted 9 lines
            "
 # patches needed by musl
--
2.31.1.751.gd2f1c929bd-goog