Merge pull request #12087 from yuwata/fix-condition-free-list

util: fix condition_free_list_type()

src/network/netdev/netdev.h

@@ -81,7 +81,7 @@ typedef struct NetDev {
 
         char *filename;
 
-        Condition *conditions;
+        LIST_HEAD(Condition, conditions);
 
         NetDevState state;
         NetDevKind kind;

src/network/networkd-network.h

@@ -97,7 +97,7 @@ struct Network {
         char **match_driver;
         char **match_type;
         char **match_name;
-        Condition *conditions;
+        LIST_HEAD(Condition, conditions);
 
         char *description;
 

src/shared/condition.c

@@ -77,17 +77,17 @@ void condition_free(Condition *c) {
         free(c);
 }
 
-Condition* condition_free_list_type(Condition *first, ConditionType type) {
-        Condition *c, *n, *r = NULL;
+Condition* condition_free_list_type(Condition *head, ConditionType type) {
+        Condition *c, *n;
 
-        LIST_FOREACH_SAFE(conditions, c, n, first)
-                if (type < 0 || c->type == type)
+        LIST_FOREACH_SAFE(conditions, c, n, head)
+                if (type < 0 || c->type == type) {
+                        LIST_REMOVE(conditions, head, c);
                         condition_free(c);
-                else if (!r)
-                        r = c;
+                }
 
-        assert(type >= 0 || !r);
-        return r;
+        assert(type >= 0 || !head);
+        return head;
 }
 
 static int condition_test_kernel_command_line(Condition *c) {

src/udev/net/link-config.h

@@ -40,7 +40,7 @@ struct link_config {
         char **match_driver;
         char **match_type;
         char **match_name;
-        Condition *conditions;
+        LIST_HEAD(Condition, conditions);
 
         char *description;
         struct ether_addr *mac;

test/fuzz/fuzz-link-parser/oss-fuzz-13878

@@ -0,0 +1,4 @@
+[Match]
+KernelVersion=t
+Virtualization=q
+KernelVersion=