[NETFILTER]: nfnetlink_log: fix computation of netlink skb size
authorEric Leblond <eric@inl.fr>
Mon, 10 Mar 2008 23:42:04 +0000 (16:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 10 Mar 2008 23:42:04 +0000 (16:42 -0700)
This patch is similar to nfnetlink_queue fixes. It fixes the computation
of skb size by using NLMSG_SPACE instead of NLMSG_ALIGN.

Signed-off-by: Eric Leblond <eric@inl.fr>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nfnetlink_log.c

index 7efa40d47393727447fd1bdbf88d579914e5cfc4..c6802c0d6ed8f5806b2602b7fc81bfe71e33a60c 100644 (file)
@@ -556,7 +556,7 @@ nfulnl_log_packet(unsigned int pf,
        /* FIXME: do we want to make the size calculation conditional based on
         * what is actually present?  way more branches and checks, but more
         * memory efficient... */
-       size =    NLMSG_ALIGN(sizeof(struct nfgenmsg))
+       size =    NLMSG_SPACE(sizeof(struct nfgenmsg))
                + nla_total_size(sizeof(struct nfulnl_msg_packet_hdr))
                + nla_total_size(sizeof(u_int32_t))     /* ifindex */
                + nla_total_size(sizeof(u_int32_t))     /* ifindex */