From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 7 Jul 2021 01:05:08 +0000 (+0900)
Subject: sd-netlink: make message_seal() accept already sealed messages
X-Git-Tag: v250-rc1~763^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c737abd31bfb71f81145906f2364a6265fcf55d9;p=thirdparty%2Fsystemd.git

sd-netlink: make message_seal() accept already sealed messages

The function can be idempotent. It is not necessary to refuse already
sealed messages.
---

diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index 922700c6340..075d0218844 100644
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -1307,8 +1307,7 @@ int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *genl) {
         assert_return(genl || m->protocol != NETLINK_GENERIC, -EINVAL);
 
         /* don't allow appending to message once parsed */
-        if (!m->sealed)
-                message_seal(m);
+        message_seal(m);
 
         for (unsigned i = 1; i <= m->n_containers; i++)
                 m->containers[i].attributes = mfree(m->containers[i].attributes);
@@ -1351,7 +1350,6 @@ int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *genl) {
 
 void message_seal(sd_netlink_message *m) {
         assert(m);
-        assert(!m->sealed);
 
         m->sealed = true;
 }