From ef2a3164737f5d2fb14b80d29ab1ad4638bf315d Mon Sep 17 00:00:00 2001 From: Yasuyuki Kozakai Date: Mon, 5 Dec 2005 13:33:26 -0800 Subject: [PATCH] --- yaml --- r: 14993 b: refs/heads/master c: 3ebbe0cdd41f62e5c79cb4d7aa42a1ca50d7d2f2 h: refs/heads/master i: 14991: ec9790fbd6c04e20c3335cdb9ce3432887e93b5b v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c49c864ae65f..b59aa05cbf45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f16c910724250c1af0f53111b4c76505000819f6 +refs/heads/master: 3ebbe0cdd41f62e5c79cb4d7aa42a1ca50d7d2f2 diff --git a/trunk/net/netfilter/nfnetlink.c b/trunk/net/netfilter/nfnetlink.c index a60c59b97631..95fdf04f1d88 100644 --- a/trunk/net/netfilter/nfnetlink.c +++ b/trunk/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; }