lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Yasuyuki Kozakai
2005-12-05 13:33:26 -08:00
committed by David S. Miller
parent f16c910724
commit 3ebbe0cdd4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/netfilter/nfnetlink.c
View File

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