From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Thu, 7 Oct 2021 12:34:42 +0000 (+0100)
Subject: network: assert on dereferenced pointer
X-Git-Tag: v250-rc1~551
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2eacd9a7b6d9d109d9aba0fbb6e4e9d99e332db4;p=thirdparty%2Fsystemd.git

network: assert on dereferenced pointer

CID#1462762
---

diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index a32f6b8e270..d547efa768b 100644
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -59,6 +59,8 @@ int link_lldp_tx_configure(Link *link) {
         if (r < 0)
                 return r;
 
+        assert(link->network);
+
         r = sd_lldp_tx_set_multicast_mode(link->lldp_tx, link->network->lldp_multicast_mode);
         if (r < 0)
                 return r;
@@ -67,7 +69,7 @@ int link_lldp_tx_configure(Link *link) {
                                         SD_LLDP_SYSTEM_CAPABILITIES_STATION |
                                         SD_LLDP_SYSTEM_CAPABILITIES_BRIDGE |
                                         SD_LLDP_SYSTEM_CAPABILITIES_ROUTER,
-                                        (link->network && link->network->ip_forward != ADDRESS_FAMILY_NO) ?
+                                        (link->network->ip_forward != ADDRESS_FAMILY_NO) ?
                                         SD_LLDP_SYSTEM_CAPABILITIES_ROUTER :
                                         SD_LLDP_SYSTEM_CAPABILITIES_STATION);
         if (r < 0)