[NETFILTER]: nfnetlink: Fix calculation of minimum message length

At least, valid nfnetlink message should have nlmsghdr and nfgenmsg.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index a60c59b97631..95fdf04f1d88 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -162,7 +162,7 @@ nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,
                 return -EINVAL;
         }
 
-        min_len = NLMSG_ALIGN(sizeof(struct nfgenmsg));
+        min_len = NLMSG_SPACE(sizeof(struct nfgenmsg));
         if (unlikely(nlh->nlmsg_len < min_len))
                 return -EINVAL;
 
@@ -236,8 +236,7 @@ static inline int nfnetlink_rcv_msg(struct sk_buff *skb,
         }
 
         /* All the messages must at least contain nfgenmsg */
-        if (nlh->nlmsg_len < 
-                        NLMSG_LENGTH(NLMSG_ALIGN(sizeof(struct nfgenmsg)))) {
+        if (nlh->nlmsg_len < NLMSG_SPACE(sizeof(struct nfgenmsg))) {
                 DEBUGP("received message was too short\n");
                 return 0;
         }