kernel-netlink: Align concatenated Netlink responses

The code to support parallel Netlink queries (commit 3c7193f) made use
of nlmsg_len member from struct nlmsghdr to allocate and copy the
responses. Since NLMSG_NEXT is later used to parse these responses, they
must be aligned, or the results are undefined.

Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
index 441c0c4829e155a15803047fb83efc3c82f6a7c1..2327d75915f0b327161031310d35ad33fb3f6a90 100644 (file)
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
@@ -381,7 +381,7 @@ static status_t send_once(private_netlink_socket_t *this, struct nlmsghdr *in,
        for (i = 0, *out_len = 0; i < array_count(entry->hdrs); i++)
        {
                array_get(entry->hdrs, i, &hdr);
-               *out_len += hdr->nlmsg_len;
+               *out_len += NLMSG_ALIGN(hdr->nlmsg_len);
        }
        ptr = malloc(*out_len);
        *out = (struct nlmsghdr*)ptr;
@@ -394,7 +394,7 @@ static status_t send_once(private_netlink_socket_t *this, struct nlmsghdr *in,
                                 hdr->nlmsg_seq, hdr, hdr->nlmsg_len);
                }
                memcpy(ptr, hdr, hdr->nlmsg_len);
-               ptr += hdr->nlmsg_len;
+               ptr += NLMSG_ALIGN(hdr->nlmsg_len);
                free(hdr);
        }
        destroy_entry(entry);