Merge branch 'master' of git://blackhole.kfki.hu/nf-next

Jozsef Kadlecsik says:

====================
ipset patches for nf-next

- Remove useless memset() calls, nla_parse_nested/nla_parse
erase the tb array properly, from Florent Fourcot.
- Merge the uadd and udel functions, the code is nicer
this way, also from Florent Fourcot.
- Add a missing check for the return value of a
nla_parse[_deprecated] call, from Aditya Pakki.
- Add the last missing check for the return value
of nla_parse[_deprecated] call.
- Fix error path and release the references properly
in set_target_v3_checkentry().
- Fix memory accounting which is reported to userspace
for hash types on resize, from Stefano Brivio.
- Update my email address to [e-mail].
The patch covers all places in the source tree where
my [e-mail] address could be found.
====================

Signed-off-by: Pablo Neira Ayuso <[e-mail]>

CREDITS

···
 S: Denmark
 
 N: Jozsef Kadlecsik
-E: [e-mail]
+E: [e-mail]
 P: 1024D/470DB964 4CB3 1A05 713E 9BF7 FAC5  5809 DD8C B7B1 470D B964
 D: netfilter: TCP window tracking code
 D: netfilter: raw table

MAINTAINERS

···
 
 NETFILTER
 M:	Pablo Neira Ayuso <[e-mail]>
-M:	Jozsef Kadlecsik <[e-mail]>
+M:	Jozsef Kadlecsik <[e-mail]>
 M:	Florian Westphal <[e-mail]>
 L:	[e-mail]
 L:	[e-mail]

include/linux/jhash.h

···
  * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
  * the public domain.  It has no warranty.
  *
- * Copyright (C) 2009-2010 Jozsef Kadlecsik ([e-mail])
+ * Copyright (C) 2009-2010 Jozsef Kadlecsik ([e-mail])
  *
  * I've modified Bob's hash to be useful in the Linux kernel, and
  * any bugs present are my fault.

include/linux/netfilter/ipset/ip_set.h

···
 /* Copyright (C) 2000-2002 Joakim Axelsson <[e-mail]>
  *                         Patrick Schaaf <[e-mail]>
  *                         Martin Josefsson <[e-mail]>
- * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

include/linux/netfilter/ipset/ip_set_counter.h

···
 #ifndef _IP_SET_COUNTER_H
 #define _IP_SET_COUNTER_H
 
-/* Copyright (C) 2015 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2015 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

include/linux/netfilter/ipset/ip_set_skbinfo.h

···
 #ifndef _IP_SET_SKBINFO_H
 #define _IP_SET_SKBINFO_H
 
-/* Copyright (C) 2015 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2015 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

include/linux/netfilter/ipset/ip_set_timeout.h

···
 #ifndef _IP_SET_TIMEOUT_H
 #define _IP_SET_TIMEOUT_H
 
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

include/uapi/linux/netfilter/ipset/ip_set.h

···
 /* Copyright (C) 2000-2002 Joakim Axelsson <[e-mail]>
  *                         Patrick Schaaf <[e-mail]>
  *                         Martin Josefsson <[e-mail]>
- * Copyright (C) 2003-2011 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003-2011 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

net/ipv4/netfilter/iptable_raw.c

···
 /*
  * 'raw' table, which is the very first hooked in at PRE_ROUTING and LOCAL_OUT .
  *
- * Copyright (C) 2003 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003 Jozsef Kadlecsik <[e-mail]>
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>

net/ipv4/netfilter/nf_nat_h323.c

···
  * This source code is licensed under General Public License version 2.
  *
  * Based on the 'brute force' H.323 NAT module by
- * Jozsef Kadlecsik <[e-mail]>
+ * Jozsef Kadlecsik <[e-mail]>
  */
 
 #include <linux/module.h>

net/ipv6/netfilter/ip6table_raw.c

···
 /*
  * IPv6 raw table, a port of the IPv4 raw table to IPv6
  *
- * Copyright (C) 2003 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003 Jozsef Kadlecsik <[e-mail]>
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>

net/netfilter/ipset/ip_set_bitmap_gen.h

···
-/* Copyright (C) 2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

net/netfilter/ipset/ip_set_bitmap_ip.c

···
 /* Copyright (C) 2000-2002 Joakim Axelsson <[e-mail]>
  *                         Patrick Schaaf <[e-mail]>
- * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	3	/* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("bitmap:ip", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_bitmap:ip");
 

net/netfilter/ipset/ip_set_bitmap_ipmac.c

···
 /* Copyright (C) 2000-2002 Joakim Axelsson <[e-mail]>
  *                         Patrick Schaaf <[e-mail]>
  *			   Martin Josefsson <[e-mail]>
- * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	3	/* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("bitmap:ip,mac", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_bitmap:ip,mac");
 

net/netfilter/ipset/ip_set_bitmap_port.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	3	/* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("bitmap:port", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_bitmap:port");
 

net/netfilter/ipset/ip_set_core.c

···
 /* Copyright (C) 2000-2002 Joakim Axelsson <[e-mail]>
  *                         Patrick Schaaf <[e-mail]>
- * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 module_param(max_sets, int, 0600);
 MODULE_PARM_DESC(max_sets, "maximal number of sets");
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 MODULE_DESCRIPTION("core IP set support");
 MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_IPSET);
 
···
 	struct nlattr *attr = (void *)nlh + min_len;
 	u32 dump_type;
 	ip_set_id_t index;
+	int ret;
 
-	/* Second pass, so parser can't fail */
-	nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, attr,
-			     nlh->nlmsg_len - min_len, ip_set_setname_policy,
-			     NULL);
+	ret = nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, attr,
+				   nlh->nlmsg_len - min_len,
+				   ip_set_setname_policy, NULL);
+	if (ret)
+		return ret;
 
 	cb->args[IPSET_CB_PROTO] = nla_get_u8(cda[IPSET_ATTR_PROTOCOL]);
 	if (cda[IPSET_ATTR_SETNAME]) {
···
 		memcpy(&errmsg->msg, nlh, nlh->nlmsg_len);
 		cmdattr = (void *)&errmsg->msg + min_len;
 
-		nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, cmdattr,
-				     nlh->nlmsg_len - min_len,
-				     ip_set_adt_policy, NULL);
+		ret = nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, cmdattr,
+					   nlh->nlmsg_len - min_len,
+					   ip_set_adt_policy, NULL);
 
+		if (ret) {
+			nlmsg_free(skb2);
+			return ret;
+		}
 		errline = nla_data(cda[IPSET_ATTR_LINENO]);
 
 		*errline = lineno;
···
 	return ret;
 }
 
-static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb,
-		       const struct nlmsghdr *nlh,
-		       const struct nlattr * const attr[],
-		       struct netlink_ext_ack *extack)
+static int ip_set_ad(struct net *net, struct sock *ctnl,
+		     struct sk_buff *skb,
+		     enum ipset_adt adt,
+		     const struct nlmsghdr *nlh,
+		     const struct nlattr * const attr[],
+		     struct netlink_ext_ack *extack)
 {
 	struct ip_set_net *inst = ip_set_pernet(net);
 	struct ip_set *set;
···
 	if (attr[IPSET_ATTR_DATA]) {
 		if (nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA], set->type->adt_policy, NULL))
 			return -IPSET_ERR_PROTOCOL;
-		ret = call_ad(ctnl, skb, set, tb, IPSET_ADD, flags,
+		ret = call_ad(ctnl, skb, set, tb, adt, flags,
 			      use_lineno);
 	} else {
 		int nla_rem;
 
 		nla_for_each_nested(nla, attr[IPSET_ATTR_ADT], nla_rem) {
-			memset(tb, 0, sizeof(tb));
 			if (nla_type(nla) != IPSET_ATTR_DATA ||
 			    !flag_nested(nla) ||
 			    nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, nla, set->type->adt_policy, NULL))
 				return -IPSET_ERR_PROTOCOL;
-			ret = call_ad(ctnl, skb, set, tb, IPSET_ADD,
+			ret = call_ad(ctnl, skb, set, tb, adt,
 				      flags, use_lineno);
 			if (ret < 0)
 				return ret;
···
 	return ret;
 }
 
-static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb,
-		       const struct nlmsghdr *nlh,
+static int ip_set_uadd(struct net *net, struct sock *ctnl,
+		       struct sk_buff *skb, const struct nlmsghdr *nlh,
 		       const struct nlattr * const attr[],
 		       struct netlink_ext_ack *extack)
 {
-	struct ip_set_net *inst = ip_set_pernet(net);
-	struct ip_set *set;
-	struct nlattr *tb[IPSET_ATTR_ADT_MAX + 1] = {};
-	const struct nlattr *nla;
-	u32 flags = flag_exist(nlh);
-	bool use_lineno;
-	int ret = 0;
+	return ip_set_ad(net, ctnl, skb,
+			 IPSET_ADD, nlh, attr, extack);
+}
 
-	if (unlikely(protocol_min_failed(attr) ||
-		     !attr[IPSET_ATTR_SETNAME] ||
-		     !((attr[IPSET_ATTR_DATA] != NULL) ^
-		       (attr[IPSET_ATTR_ADT] != NULL)) ||
-		     (attr[IPSET_ATTR_DATA] &&
-		      !flag_nested(attr[IPSET_ATTR_DATA])) ||
-		     (attr[IPSET_ATTR_ADT] &&
-		      (!flag_nested(attr[IPSET_ATTR_ADT]) ||
-		       !attr[IPSET_ATTR_LINENO]))))
-		return -IPSET_ERR_PROTOCOL;
-
-	set = find_set(inst, nla_data(attr[IPSET_ATTR_SETNAME]));
-	if (!set)
-		return -ENOENT;
-
-	use_lineno = !!attr[IPSET_ATTR_LINENO];
-	if (attr[IPSET_ATTR_DATA]) {
-		if (nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA], set->type->adt_policy, NULL))
-			return -IPSET_ERR_PROTOCOL;
-		ret = call_ad(ctnl, skb, set, tb, IPSET_DEL, flags,
-			      use_lineno);
-	} else {
-		int nla_rem;
-
-		nla_for_each_nested(nla, attr[IPSET_ATTR_ADT], nla_rem) {
-			memset(tb, 0, sizeof(*tb));
-			if (nla_type(nla) != IPSET_ATTR_DATA ||
-			    !flag_nested(nla) ||
-			    nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, nla, set->type->adt_policy, NULL))
-				return -IPSET_ERR_PROTOCOL;
-			ret = call_ad(ctnl, skb, set, tb, IPSET_DEL,
-				      flags, use_lineno);
-			if (ret < 0)
-				return ret;
-		}
-	}
-	return ret;
+static int ip_set_udel(struct net *net, struct sock *ctnl,
+		       struct sk_buff *skb, const struct nlmsghdr *nlh,
+		       const struct nlattr * const attr[],
+		       struct netlink_ext_ack *extack)
+{
+	return ip_set_ad(net, ctnl, skb,
+			 IPSET_DEL, nlh, attr, extack);
 }
 
 static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,

net/netfilter/ipset/ip_set_getport.c

···
-/* Copyright (C) 2003-2011 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2011 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

net/netfilter/ipset/ip_set_hash_gen.h

···
-/* Copyright (C) 2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 					goto cleanup;
 				}
 				m->size = AHASH_INIT_SIZE;
-				extsize = ext_size(AHASH_INIT_SIZE, dsize);
+				extsize += ext_size(AHASH_INIT_SIZE, dsize);
 				RCU_INIT_POINTER(hbucket(t, key), m);
 			} else if (m->pos >= m->size) {
 				struct hbucket *ht;

net/netfilter/ipset/ip_set_hash_ip.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	4	/* skbinfo support  */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:ip", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:ip");
 

net/netfilter/ipset/ip_set_hash_ipmark.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  * Copyright (C) 2013 Smoothwall Ltd. <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify

net/netfilter/ipset/ip_set_hash_ipport.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	5 /* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:ip,port", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:ip,port");
 

net/netfilter/ipset/ip_set_hash_ipportip.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	5 /* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:ip,port,ip", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:ip,port,ip");
 

net/netfilter/ipset/ip_set_hash_ipportnet.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	7 /* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:ip,port,net", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:ip,port,net");
 

net/netfilter/ipset/ip_set_hash_mac.c

···
-/* Copyright (C) 2014 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2014 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	0
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:mac", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:mac");
 

net/netfilter/ipset/ip_set_hash_net.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	6 /* skbinfo mapping support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:net", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:net");
 

net/netfilter/ipset/ip_set_hash_netiface.c

···
-/* Copyright (C) 2011-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2011-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	6 /* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:net,iface", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:net,iface");
 

net/netfilter/ipset/ip_set_hash_netnet.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  * Copyright (C) 2013 Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
  *
  * This program is free software; you can redistribute it and/or modify

net/netfilter/ipset/ip_set_hash_netport.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	7 /* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("hash:net,port", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_hash:net,port");
 

net/netfilter/ipset/ip_set_hash_netportnet.c

···
-/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

net/netfilter/ipset/ip_set_list_set.c

···
-/* Copyright (C) 2008-2013 Jozsef Kadlecsik <[e-mail]>
+/* Copyright (C) 2008-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #define IPSET_TYPE_REV_MAX	3 /* skbinfo support added */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 IP_SET_MODULE_DESC("list:set", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);
 MODULE_ALIAS("ip_set_list:set");
 

net/netfilter/nf_conntrack_h323_main.c

···
  * This source code is licensed under General Public License version 2.
  *
  * Based on the 'brute force' H.323 connection tracking module by
- * Jozsef Kadlecsik <[e-mail]>
+ * Jozsef Kadlecsik <[e-mail]>
  *
  * For more information, please see http://nath323.sourceforge.net/
  */

net/netfilter/nf_conntrack_proto_tcp.c

···
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[e-mail]>
- * (C) 2002-2013 Jozsef Kadlecsik <[e-mail]>
+ * (C) 2002-2013 Jozsef Kadlecsik <[e-mail]>
  * (C) 2006-2012 Patrick McHardy <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify

net/netfilter/xt_iprange.c

···
 /*
  *	xt_iprange - Netfilter module to match IP address ranges
  *
- *	(C) 2003 Jozsef Kadlecsik <[e-mail]>
+ *	(C) 2003 Jozsef Kadlecsik <[e-mail]>
  *	(C) CC Computer Consultants GmbH, 2008
  *
  *	This program is free software; you can redistribute it and/or modify
···
 module_init(iprange_mt_init);
 module_exit(iprange_mt_exit);
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 MODULE_AUTHOR("Jan Engelhardt <[e-mail]>");
 MODULE_DESCRIPTION("Xtables: arbitrary IPv4 range matching");
 MODULE_ALIAS("ipt_iprange");

net/netfilter/xt_set.c

···
 /* Copyright (C) 2000-2002 Joakim Axelsson <[e-mail]>
  *                         Patrick Schaaf <[e-mail]>
  *                         Martin Josefsson <[e-mail]>
- * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
+ * Copyright (C) 2003-2013 Jozsef Kadlecsik <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #include <uapi/linux/netfilter/xt_set.h>
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
+MODULE_AUTHOR("Jozsef Kadlecsik <[e-mail]>");
 MODULE_DESCRIPTION("Xtables: IP set match and target module");
 MODULE_ALIAS("xt_SET");
 MODULE_ALIAS("ipt_set");
···
 {
 	const struct xt_set_info_target_v3 *info = par->targinfo;
 	ip_set_id_t index;
+	int ret = 0;
 
 	if (info->add_set.index != IPSET_INVALID_ID) {
 		index = ip_set_nfnl_get_byindex(par->net,
···
 		if (index == IPSET_INVALID_ID) {
 			pr_info_ratelimited("Cannot find del_set index %u as target\n",
 					    info->del_set.index);
-			if (info->add_set.index != IPSET_INVALID_ID)
-				ip_set_nfnl_put(par->net,
-						info->add_set.index);
-			return -ENOENT;
+			ret = -ENOENT;
+			goto cleanup_add;
 		}
 	}
 
 	if (info->map_set.index != IPSET_INVALID_ID) {
 		if (strncmp(par->table, "mangle", 7)) {
 			pr_info_ratelimited("--map-set only usable from mangle table\n");
-			return -EINVAL;
+			ret = -EINVAL;
+			goto cleanup_del;
 		}
 		if (((info->flags & IPSET_FLAG_MAP_SKBPRIO) |
 		     (info->flags & IPSET_FLAG_MAP_SKBQUEUE)) &&
···
 					 1 << NF_INET_LOCAL_OUT |
 					 1 << NF_INET_POST_ROUTING))) {
 			pr_info_ratelimited("mapping of prio or/and queue is allowed only from OUTPUT/FORWARD/POSTROUTING chains\n");
-			return -EINVAL;
+			ret = -EINVAL;
+			goto cleanup_del;
 		}
 		index = ip_set_nfnl_get_byindex(par->net,
 						info->map_set.index);
 		if (index == IPSET_INVALID_ID) {
 			pr_info_ratelimited("Cannot find map_set index %u as target\n",
 					    info->map_set.index);
-			if (info->add_set.index != IPSET_INVALID_ID)
-				ip_set_nfnl_put(par->net,
-						info->add_set.index);
-			if (info->del_set.index != IPSET_INVALID_ID)
-				ip_set_nfnl_put(par->net,
-						info->del_set.index);
-			return -ENOENT;
+			ret = -ENOENT;
+			goto cleanup_del;
 		}
 	}
 
···
 	    info->del_set.dim > IPSET_DIM_MAX ||
 	    info->map_set.dim > IPSET_DIM_MAX) {
 		pr_info_ratelimited("SET target dimension over the limit!\n");
-		if (info->add_set.index != IPSET_INVALID_ID)
-			ip_set_nfnl_put(par->net, info->add_set.index);
-		if (info->del_set.index != IPSET_INVALID_ID)
-			ip_set_nfnl_put(par->net, info->del_set.index);
-		if (info->map_set.index != IPSET_INVALID_ID)
-			ip_set_nfnl_put(par->net, info->map_set.index);
-		return -ERANGE;
+		ret = -ERANGE;
+		goto cleanup_mark;
 	}
 
 	return 0;
+cleanup_mark:
+	if (info->map_set.index != IPSET_INVALID_ID)
+		ip_set_nfnl_put(par->net, info->map_set.index);
+cleanup_del:
+	if (info->del_set.index != IPSET_INVALID_ID)
+		ip_set_nfnl_put(par->net, info->del_set.index);
+cleanup_add:
+	if (info->add_set.index != IPSET_INVALID_ID)
+		ip_set_nfnl_put(par->net, info->add_set.index);
+	return ret;
 }
 
 static void