diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-12-11 21:43:56 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-01-06 08:23:27 +0100 |
commit | 44c7de48a8c5e42715183e10c4fcb106a39b7ddf (patch) | |
tree | a710d6ef9f74d28eb8b7bf616a27bf8b3a8cdd6a | |
parent | b4145a212b337b92da870b4dc5bc267fd5f270c0 (diff) |
Use nlmsg_total_size instead of NLMSG_SPACE in ip_set_core.c.
-rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index 436bfd1..45504b7 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -1214,7 +1214,7 @@ static int dump_init(struct netlink_callback *cb, struct ip_set_net *inst) { struct nlmsghdr *nlh = nlmsg_hdr(cb->skb); - int min_len = NLMSG_SPACE(sizeof(struct nfgenmsg)); + int min_len = nlmsg_total_size(sizeof(struct nfgenmsg)); struct nlattr *cda[IPSET_ATTR_CMD_MAX+1]; struct nlattr *attr = (void *)nlh + min_len; u32 dump_type; @@ -1447,7 +1447,7 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set, struct nlmsgerr *errmsg; size_t payload = min(SIZE_MAX, sizeof(*errmsg) + nlmsg_len(nlh)); - int min_len = NLMSG_SPACE(sizeof(struct nfgenmsg)); + int min_len = nlmsg_total_size(sizeof(struct nfgenmsg)); struct nlattr *cda[IPSET_ATTR_CMD_MAX+1]; struct nlattr *cmdattr; u32 *errline; |