diff options
| author | Sergey Popovich | 2015-06-12 21:26:43 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik | 2015-06-14 10:40:13 +0200 |
| commit | a212e08e8e0a5c689e61dd175b6e99223dda835c (patch) | |
| tree | b9dcc3d73e3379556a9fe0fdec8ff3378443635c /net/netfilter/ipset/ip_set_bitmap_ipmac.c | |
| parent | netfilter: ipset: Permit CIDR equal to the host address CIDR in IPv6 (diff) | |
| download | kernel-qcow2-linux-a212e08e8e0a5c689e61dd175b6e99223dda835c.tar.gz kernel-qcow2-linux-a212e08e8e0a5c689e61dd175b6e99223dda835c.tar.xz kernel-qcow2-linux-a212e08e8e0a5c689e61dd175b6e99223dda835c.zip | |
netfilter: ipset: Make sure we always return line number on batch
Even if we return with generic IPSET_ERR_PROTOCOL it is good idea
to return line number if we called in batch mode.
Moreover we are not always exiting with IPSET_ERR_PROTOCOL. For
example hash:ip,port,net may return IPSET_ERR_HASH_RANGE_UNSUPPORTED
or IPSET_ERR_INVALID_CIDR.
Signed-off-by: Sergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'net/netfilter/ipset/ip_set_bitmap_ipmac.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_bitmap_ipmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c index 0648e749114b..773342292623 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@ -239,12 +239,12 @@ bitmap_ipmac_uadt(struct ip_set *set, struct nlattr *tb[], u32 ip = 0; int ret = 0; - if (unlikely(!tb[IPSET_ATTR_IP])) - return -IPSET_ERR_PROTOCOL; - if (tb[IPSET_ATTR_LINENO]) *lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]); + if (unlikely(!tb[IPSET_ATTR_IP])) + return -IPSET_ERR_PROTOCOL; + ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP], &ip); if (ret) return ret; |