Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2019-06-22 11:23:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipset" Sat Jun 22 11:23:55 2019 rev:34 rq:710362 version:7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ipset/ipset.changes 2018-12-19 13:27:22.297091628 +0100 +++ /work/SRC/openSUSE:Factory/.ipset.new.4615/ipset.changes 2019-06-22 11:23:58.581373212 +0200 @@ -1,0 +2,6 @@ +Mon Jun 10 13:09:47 UTC 2019 - Jan Engelhardt <[email protected]> + +- Update to new upstream release 7.2 + * ipset: Fix memory accounting for hash types on resize + +------------------------------------------------------------------- Old: ---- ipset-7.1.tar.bz2 New: ---- ipset-7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ --- /var/tmp/diff_new_pack.mukEOT/_old 2019-06-22 11:23:59.445374116 +0200 +++ /var/tmp/diff_new_pack.mukEOT/_new 2019-06-22 11:23:59.453374124 +0200 @@ -1,7 +1,7 @@ # # spec file for package ipset # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %define ipset_build_kmp 0 %endif Name: ipset -Version: 7.1 +Version: 7.2 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0-only @@ -40,16 +40,14 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: linux-glibc-devel >= 2.6.24 -BuildRequires: pkgconfig >= 0.21 +BuildRequires: pkg-config >= 0.21 BuildRequires: pkgconfig(libmnl) >= 1 %if 0%{?ipset_build_kmp} BuildRequires: %kernel_module_package_buildreqs BuildRequires: kernel-devel >= 2.6.39 %kernel_module_package -p %name-preamble -%if 0%{?suse_version} >= 1320 BuildRequires: kmod-compat %endif -%endif %description IP sets are a framework inside the Linux kernel, which can be @@ -104,8 +102,6 @@ %prep %autosetup -p1 -#%%setup -q -#%%patch -P 1 -p1 %build # build wants to call modinfo at some point ++++++ ipset-7.1.tar.bz2 -> ipset-7.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/ChangeLog new/ipset-7.2/ChangeLog --- old/ipset-7.1/ChangeLog 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/ChangeLog 2019-06-10 12:10:11.000000000 +0200 @@ -1,3 +1,6 @@ +7.2 + - Update my email address + 7.1 - Add compatibility support for strscpy() - Correct the manpage about the sort option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/configure new/ipset-7.2/configure --- old/ipset-7.1/configure 2018-12-11 13:29:02.000000000 +0100 +++ new/ipset-7.2/configure 2019-06-10 12:12:23.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ipset 7.1. +# Generated by GNU Autoconf 2.69 for ipset 7.2. # -# Report bugs to <[email protected]>. +# Report bugs to <[email protected]>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,10 +275,10 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell [email protected] and -$0: [email protected] about your system, including -$0: any error possibly output before this message. Then -$0: install a modern shell, or manually run the script -$0: under such a shell if you do have one." +$0: [email protected] about your system, including any +$0: error possibly output before this message. Then install +$0: a modern shell, or manually run the script under such a +$0: shell if you do have one." fi exit 1 fi @@ -594,9 +594,9 @@ # Identity of this package. PACKAGE_NAME='ipset' PACKAGE_TARNAME='ipset' -PACKAGE_VERSION='7.1' -PACKAGE_STRING='ipset 7.1' -PACKAGE_BUGREPORT='[email protected]' +PACKAGE_VERSION='7.2' +PACKAGE_STRING='ipset 7.2' +PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1433,7 +1433,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ipset 7.1 to adapt to many kinds of systems. +\`configure' configures ipset 7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1504,7 +1504,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ipset 7.1:";; + short | recursive ) echo "Configuration of ipset 7.2:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <[email protected]>. +Report bugs to <[email protected]>. _ACEOF ac_status=$? fi @@ -1642,7 +1642,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ipset configure 7.1 +ipset configure 7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2020,7 +2020,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ipset $as_me 7.1, which was +It was created by ipset $as_me 7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2957,7 +2957,7 @@ # Define the identity of the package. PACKAGE='ipset' - VERSION='7.1' + VERSION='7.2' cat >>confdefs.h <<_ACEOF @@ -17943,7 +17943,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ipset $as_me 7.1, which was +This file was extended by ipset $as_me 7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18003,13 +18003,13 @@ Configuration commands: $config_commands -Report bugs to <[email protected]>." +Report bugs to <[email protected]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ipset config.status 7.1 +ipset config.status 7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/configure.ac new/ipset-7.2/configure.ac --- old/ipset-7.1/configure.ac 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/configure.ac 2019-06-10 12:10:11.000000000 +0200 @@ -1,5 +1,5 @@ dnl Boilerplate -AC_INIT([ipset], [7.1], [[email protected]]) +AC_INIT([ipset], [7.2], [[email protected]]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/args.h new/ipset-7.2/include/libipset/args.h --- old/ipset-7.1/include/libipset/args.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/args.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2017 Jozsef Kadlecsik ([email protected]) +/* Copyright 2017 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/compat.h new/ipset-7.2/include/libipset/compat.h --- old/ipset-7.1/include/libipset/compat.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/compat.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2014 Jozsef Kadlecsik ([email protected]) +/* Copyright 2014 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/data.h new/ipset-7.2/include/libipset/data.h --- old/ipset-7.1/include/libipset/data.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/data.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/debug.h new/ipset-7.2/include/libipset/debug.h --- old/ipset-7.1/include/libipset/debug.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/debug.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/errcode.h new/ipset-7.2/include/libipset/errcode.h --- old/ipset-7.1/include/libipset/errcode.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/errcode.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2008 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2008 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/icmp.h new/ipset-7.2/include/libipset/icmp.h --- old/ipset-7.1/include/libipset/icmp.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/icmp.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/icmpv6.h new/ipset-7.2/include/libipset/icmpv6.h --- old/ipset-7.1/include/libipset/icmpv6.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/icmpv6.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/ipset.h new/ipset-7.2/include/libipset/ipset.h --- old/ipset-7.1/include/libipset/ipset.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/ipset.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/linux_ip_set.h new/ipset-7.2/include/libipset/linux_ip_set.h --- old/ipset-7.1/include/libipset/linux_ip_set.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/linux_ip_set.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ /* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]> * Patrick Schaaf <[email protected]> * Martin Josefsson <[email protected]> - * Copyright (C) 2003-2011 Jozsef Kadlecsik <[email protected]> + * Copyright (C) 2003-2011 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/mnl.h new/ipset-7.2/include/libipset/mnl.h --- old/ipset-7.1/include/libipset/mnl.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/mnl.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/nf_inet_addr.h new/ipset-7.2/include/libipset/nf_inet_addr.h --- old/ipset-7.1/include/libipset/nf_inet_addr.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/nf_inet_addr.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/parse.h new/ipset-7.2/include/libipset/parse.h --- old/ipset-7.1/include/libipset/parse.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/parse.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/print.h new/ipset-7.2/include/libipset/print.h --- old/ipset-7.1/include/libipset/print.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/print.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/session.h new/ipset-7.2/include/libipset/session.h --- old/ipset-7.1/include/libipset/session.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/session.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/transport.h new/ipset-7.2/include/libipset/transport.h --- old/ipset-7.1/include/libipset/transport.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/transport.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/types.h new/ipset-7.2/include/libipset/types.h --- old/ipset-7.1/include/libipset/types.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/types.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/include/libipset/utils.h new/ipset-7.2/include/libipset/utils.h --- old/ipset-7.1/include/libipset/utils.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/include/libipset/utils.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/ChangeLog new/ipset-7.2/kernel/ChangeLog --- old/ipset-7.1/kernel/ChangeLog 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/ChangeLog 2019-06-10 12:10:11.000000000 +0200 @@ -1,3 +1,12 @@ +7.2 + - Update my email address + - ipset: Fix memory accounting for hash types on resize (Stefano Brivio) + - Fix error path in set_target_v3_checkentry() + - Fix the last missing check of nla_parse() + - netfilter: ipset: fix a missing check of nla_parse (Aditya Pakki) + - netfilter: ipset: merge uadd and udel functions (Florent Fourcot) + - netfilter: ipset: remove useless memset() calls (Florent Fourcot) + 7.1 - netfilter/ipset: replace a strncpy() with strscpy() (Qian Cai) - netfilter: ipset: fix ip_set_byindex function (Florent Fourcot) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/include/linux/jhash.h new/ipset-7.2/kernel/include/linux/jhash.h --- old/ipset-7.1/kernel/include/linux/jhash.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/include/linux/jhash.h 2019-06-10 12:10:11.000000000 +0200 @@ -17,7 +17,7 @@ * 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 ([email protected]) + * Copyright (C) 2009-2010 Jozsef Kadlecsik ([email protected]) * * I've modified Bob's hash to be useful in the Linux kernel, and * any bugs present are my fault. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set.h new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set.h --- old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ /* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]> * Patrick Schaaf <[email protected]> * Martin Josefsson <[email protected]> - * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> + * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in --- old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in 2019-06-10 12:10:11.000000000 +0200 @@ -304,12 +304,15 @@ #ifdef HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS #define IPSET_CBFN(fn, net, nl, skb, nlh, cda, e) fn(net, nl, skb, nlh, cda, e) +#define IPSET_CBFN_AD(fn, net, nl, skb, ad, nlh, cda, e) fn(net, nl, skb, ad, nlh, cda, e) #define IPSET_SOCK_NET(net, ctnl) net #elif defined(HAVE_NET_IN_NFNL_CALLBACK_FN) #define IPSET_CBFN(fn, net, nl, skb, nlh, cda, e) fn(net, nl, skb, nlh, cda) +#define IPSET_CBFN_AD(fn, net, nl, skb, ad, nlh, cda, e) fn(net, nl, skb, ad, nlh, cda) #define IPSET_SOCK_NET(net, ctnl) net #else -#define IPSET_CBFN(fn, net, nl, skb, nlh, cda,e) fn(nl, skb, nlh, cda) +#define IPSET_CBFN(fn, net, nl, skb, nlh, cda, e) fn(nl, skb, nlh, cda) +#define IPSET_CBFN_AD(fn, net, nl, skb, ad, nlh, cda, e) fn(nl, skb, ad, nlh, cda) #define IPSET_SOCK_NET(net, ctnl) sock_net(ctnl) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_counter.h new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_counter.h --- old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_counter.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_counter.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ #ifndef _IP_SET_COUNTER_H #define _IP_SET_COUNTER_H -/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_skbinfo.h new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_skbinfo.h --- old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_skbinfo.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_skbinfo.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ #ifndef _IP_SET_SKBINFO_H #define _IP_SET_SKBINFO_H -/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_timeout.h new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_timeout.h --- old/ipset-7.1/kernel/include/linux/netfilter/ipset/ip_set_timeout.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/include/linux/netfilter/ipset/ip_set_timeout.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ #ifndef _IP_SET_TIMEOUT_H #define _IP_SET_TIMEOUT_H -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/include/uapi/linux/netfilter/ipset/ip_set.h new/ipset-7.2/kernel/include/uapi/linux/netfilter/ipset/ip_set.h --- old/ipset-7.1/kernel/include/uapi/linux/netfilter/ipset/ip_set.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/include/uapi/linux/netfilter/ipset/ip_set.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ /* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]> * Patrick Schaaf <[email protected]> * Martin Josefsson <[email protected]> - * Copyright (C) 2003-2011 Jozsef Kadlecsik <[email protected]> + * Copyright (C) 2003-2011 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]> * Patrick Schaaf <[email protected]> - * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> + * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -31,7 +31,7 @@ #define IPSET_TYPE_REV_MAX 3 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("bitmap:ip", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_bitmap:ip"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ /* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]> * Patrick Schaaf <[email protected]> * Martin Josefsson <[email protected]> - * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> + * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -31,7 +31,7 @@ #define IPSET_TYPE_REV_MAX 3 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("bitmap:ip,mac", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_bitmap:ip,mac"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_port.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_port.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_bitmap_port.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_bitmap_port.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -26,7 +26,7 @@ #define IPSET_TYPE_REV_MAX 3 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("bitmap:port", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_bitmap:port"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_core.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_core.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_core.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_core.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]> * Patrick Schaaf <[email protected]> - * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> + * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -51,7 +51,7 @@ module_param(max_sets, int, 0600); MODULE_PARM_DESC(max_sets, "maximal number of sets"); MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); MODULE_DESCRIPTION("ip_set: protocol " __stringify(IPSET_PROTOCOL)); MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_IPSET); @@ -1303,10 +1303,13 @@ 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(cda, IPSET_ATTR_CMD_MAX, attr, nlh->nlmsg_len - min_len, - ip_set_setname_policy, NULL); + ret = NLA_PARSE(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]) { @@ -1564,9 +1567,14 @@ memcpy(&errmsg->msg, nlh, nlh->nlmsg_len); cmdattr = (void *)&errmsg->msg + min_len; - NLA_PARSE(cda, IPSET_ATTR_CMD_MAX, cmdattr, - nlh->nlmsg_len - min_len, ip_set_adt_policy, NULL); + ret = NLA_PARSE(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; @@ -1581,10 +1589,12 @@ } static int -IPSET_CBFN(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) +IPSET_CBFN_AD(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(IPSET_SOCK_NET(net, ctnl)); struct ip_set *set; @@ -1615,19 +1625,18 @@ 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(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; @@ -1637,59 +1646,23 @@ } static int -IPSET_CBFN(ip_set_udel, struct net *net, struct sock *ctnl, +IPSET_CBFN(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(IPSET_SOCK_NET(net, ctnl)); - 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; - - 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(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; + return IPSET_CBFN_AD(ip_set_ad, net, ctnl, skb, + IPSET_ADD, nlh, attr, extack); +} - 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(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 +IPSET_CBFN(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 IPSET_CBFN_AD(ip_set_ad, net, ctnl, skb, + IPSET_DEL, nlh, attr, extack); } static int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_getport.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_getport.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_getport.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_getport.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2011 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2011 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_gen.h --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_gen.h 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -627,7 +627,7 @@ 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ip.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ip.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ip.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ip.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -30,7 +30,7 @@ #define IPSET_TYPE_REV_MAX 4 /* skbinfo support */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:ip", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:ip"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * Copyright (C) 2013 Smoothwall Ltd. <[email protected]> * * This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipport.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipport.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipport.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipport.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -32,7 +32,7 @@ #define IPSET_TYPE_REV_MAX 5 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:ip,port", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:ip,port"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipportip.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipportip.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipportip.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipportip.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -32,7 +32,7 @@ #define IPSET_TYPE_REV_MAX 5 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:ip,port,ip", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:ip,port,ip"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -34,7 +34,7 @@ #define IPSET_TYPE_REV_MAX 7 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:ip,port,net", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:ip,port,net"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_mac.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_mac.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_mac.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_mac.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2014 Jozsef Kadlecsik <[email protected]> * * 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 @@ -23,7 +23,7 @@ #define IPSET_TYPE_REV_MAX 0 MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:mac", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:mac"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_net.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_net.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_net.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_net.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -31,7 +31,7 @@ #define IPSET_TYPE_REV_MAX 6 /* skbinfo mapping support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:net", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:net"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netiface.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netiface.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netiface.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netiface.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2011-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -32,7 +32,7 @@ #define IPSET_TYPE_REV_MAX 6 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:net,iface", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:net,iface"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netnet.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netnet.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netnet.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netnet.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * Copyright (C) 2013 Oliver Smith <[email protected]> * * This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netport.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netport.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netport.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netport.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -33,7 +33,7 @@ #define IPSET_TYPE_REV_MAX 7 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("hash:net,port", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_hash:net,port"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_list_set.c new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_list_set.c --- old/ipset-7.1/kernel/net/netfilter/ipset/ip_set_list_set.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/ipset/ip_set_list_set.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2013 Jozsef Kadlecsik <[email protected]> +/* Copyright (C) 2008-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -22,7 +22,7 @@ #define IPSET_TYPE_REV_MAX 3 /* skbinfo support added */ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); IP_SET_MODULE_DESC("list:set", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); MODULE_ALIAS("ip_set_list:set"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/kernel/net/netfilter/xt_set.c new/ipset-7.2/kernel/net/netfilter/xt_set.c --- old/ipset-7.1/kernel/net/netfilter/xt_set.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/kernel/net/netfilter/xt_set.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,7 +1,7 @@ /* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]> * Patrick Schaaf <[email protected]> * Martin Josefsson <[email protected]> - * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> + * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> * * 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 @@ -21,7 +21,7 @@ #include <uapi/linux/netfilter/xt_set.h> MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); +MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>"); MODULE_DESCRIPTION("Xtables: IP set match and target module"); MODULE_ALIAS("xt_SET"); MODULE_ALIAS("ipt_set"); @@ -479,6 +479,7 @@ { 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(XT_PAR_NET(par), @@ -496,17 +497,16 @@ if (index == IPSET_INVALID_ID) { pr_warn("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(XT_PAR_NET(par), - info->add_set.index); - return CHECK_FAIL(-ENOENT); + ret = -ENOENT; + goto cleanup_add; } } if (info->map_set.index != IPSET_INVALID_ID) { if (strncmp(par->table, "mangle", 7)) { pr_warn("--map-set only usable from mangle table\n"); - return CHECK_FAIL(-EINVAL); + ret = -EINVAL; + goto cleanup_del; } if (((info->flags & IPSET_FLAG_MAP_SKBPRIO) | (info->flags & IPSET_FLAG_MAP_SKBQUEUE)) && @@ -514,20 +514,16 @@ 1 << NF_INET_LOCAL_OUT | 1 << NF_INET_POST_ROUTING))) { pr_warn("mapping of prio or/and queue is allowed only from OUTPUT/FORWARD/POSTROUTING chains\n"); - return CHECK_FAIL(-EINVAL); + ret = -EINVAL; + goto cleanup_del; } index = ip_set_nfnl_get_byindex(XT_PAR_NET(par), info->map_set.index); if (index == IPSET_INVALID_ID) { pr_warn("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(XT_PAR_NET(par), - info->add_set.index); - if (info->del_set.index != IPSET_INVALID_ID) - ip_set_nfnl_put(XT_PAR_NET(par), - info->del_set.index); - return CHECK_FAIL(-ENOENT); + ret = -ENOENT; + goto cleanup_del; } } @@ -535,16 +531,21 @@ info->del_set.dim > IPSET_DIM_MAX || info->map_set.dim > IPSET_DIM_MAX) { pr_warn("Protocol error: SET target dimension is over the limit!\n"); - if (info->add_set.index != IPSET_INVALID_ID) - ip_set_nfnl_put(XT_PAR_NET(par), info->add_set.index); - if (info->del_set.index != IPSET_INVALID_ID) - ip_set_nfnl_put(XT_PAR_NET(par), info->del_set.index); - if (info->map_set.index != IPSET_INVALID_ID) - ip_set_nfnl_put(XT_PAR_NET(par), info->map_set.index); - return CHECK_FAIL(-ERANGE); + ret = -ERANGE; + goto cleanup_mark; } return CHECK_OK; +cleanup_mark: + if (info->map_set.index != IPSET_INVALID_ID) + ip_set_nfnl_put(XT_PAR_NET(par), info->map_set.index); +cleanup_del: + if (info->del_set.index != IPSET_INVALID_ID) + ip_set_nfnl_put(XT_PAR_NET(par), info->del_set.index); +cleanup_add: + if (info->add_set.index != IPSET_INVALID_ID) + ip_set_nfnl_put(XT_PAR_NET(par), info->add_set.index); + return CHECK_FAIL(ret); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/args.c new/ipset-7.2/lib/args.c --- old/ipset-7.1/lib/args.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/args.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2017 Jozsef Kadlecsik ([email protected]) +/* Copyright 2017 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/data.c new/ipset-7.2/lib/data.c --- old/ipset-7.1/lib/data.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/data.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/debug.c new/ipset-7.2/lib/debug.c --- old/ipset-7.1/lib/debug.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/debug.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2011 Jozsef Kadlecsik ([email protected]) +/* Copyright 2011 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/errcode.c new/ipset-7.2/lib/errcode.c --- old/ipset-7.1/lib/errcode.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/errcode.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/icmp.c new/ipset-7.2/lib/icmp.c --- old/ipset-7.1/lib/icmp.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/icmp.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/icmpv6.c new/ipset-7.2/lib/icmpv6.c --- old/ipset-7.1/lib/icmpv6.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/icmpv6.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset.c new/ipset-7.2/lib/ipset.c --- old/ipset-7.1/lib/ipset.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_bitmap_ip.c new/ipset-7.2/lib/ipset_bitmap_ip.c --- old/ipset-7.1/lib/ipset_bitmap_ip.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_bitmap_ip.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_bitmap_ipmac.c new/ipset-7.2/lib/ipset_bitmap_ipmac.c --- old/ipset-7.1/lib/ipset_bitmap_ipmac.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_bitmap_ipmac.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_bitmap_port.c new/ipset-7.2/lib/ipset_bitmap_port.c --- old/ipset-7.1/lib/ipset_bitmap_port.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_bitmap_port.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_ip.c new/ipset-7.2/lib/ipset_hash_ip.c --- old/ipset-7.1/lib/ipset_hash_ip.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_ip.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_ipmark.c new/ipset-7.2/lib/ipset_hash_ipmark.c --- old/ipset-7.1/lib/ipset_hash_ipmark.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_ipmark.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2013 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2013 Jozsef Kadlecsik ([email protected]) * Copyright 2013 Smoothwall Ltd. ([email protected]) * * This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_ipport.c new/ipset-7.2/lib/ipset_hash_ipport.c --- old/ipset-7.1/lib/ipset_hash_ipport.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_ipport.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_ipportip.c new/ipset-7.2/lib/ipset_hash_ipportip.c --- old/ipset-7.1/lib/ipset_hash_ipportip.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_ipportip.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_ipportnet.c new/ipset-7.2/lib/ipset_hash_ipportnet.c --- old/ipset-7.1/lib/ipset_hash_ipportnet.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_ipportnet.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_mac.c new/ipset-7.2/lib/ipset_hash_mac.c --- old/ipset-7.1/lib/ipset_hash_mac.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_mac.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2014 Jozsef Kadlecsik ([email protected]) +/* Copyright 2014 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_net.c new/ipset-7.2/lib/ipset_hash_net.c --- old/ipset-7.1/lib/ipset_hash_net.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_net.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_netiface.c new/ipset-7.2/lib/ipset_hash_netiface.c --- old/ipset-7.1/lib/ipset_hash_netiface.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_netiface.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2011 Jozsef Kadlecsik ([email protected]) +/* Copyright 2011 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_netnet.c new/ipset-7.2/lib/ipset_hash_netnet.c --- old/ipset-7.1/lib/ipset_hash_netnet.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_netnet.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * Copyright 2013 Oliver Smith ([email protected]) * * This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_netport.c new/ipset-7.2/lib/ipset_hash_netport.c --- old/ipset-7.1/lib/ipset_hash_netport.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_netport.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_hash_netportnet.c new/ipset-7.2/lib/ipset_hash_netportnet.c --- old/ipset-7.1/lib/ipset_hash_netportnet.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_hash_netportnet.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/ipset_list_set.c new/ipset-7.2/lib/ipset_list_set.c --- old/ipset-7.1/lib/ipset_list_set.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/ipset_list_set.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/libipset.3 new/ipset-7.2/lib/libipset.3 --- old/ipset-7.1/lib/libipset.3 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/libipset.3 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Man page written by Jozsef Kadlecsik <[email protected]> +.\" Man page written by Jozsef Kadlecsik <[email protected]> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/mnl.c new/ipset-7.2/lib/mnl.c --- old/ipset-7.1/lib/mnl.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/mnl.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/parse.c new/ipset-7.2/lib/parse.c --- old/ipset-7.1/lib/parse.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/parse.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/print.c new/ipset-7.2/lib/print.c --- old/ipset-7.1/lib/print.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/print.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/session.c new/ipset-7.2/lib/session.c --- old/ipset-7.1/lib/session.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/session.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/lib/types.c new/ipset-7.2/lib/types.c --- old/ipset-7.1/lib/types.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/lib/types.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/src/ipset.8 new/ipset-7.2/src/ipset.8 --- old/ipset-7.1/src/ipset.8 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/src/ipset.8 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Man page written by Jozsef Kadlecsik <[email protected]> +.\" Man page written by Jozsef Kadlecsik <[email protected]> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/src/ipset.c new/ipset-7.2/src/ipset.c --- old/ipset-7.1/src/ipset.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/src/ipset.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright 2000-2002 Joakim Axelsson ([email protected]) * Patrick Schaaf ([email protected]) - * Copyright 2003-2010 Jozsef Kadlecsik ([email protected]) + * Copyright 2003-2010 Jozsef Kadlecsik ([email protected]) * * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.1/src/ui.c new/ipset-7.2/src/ui.c --- old/ipset-7.1/src/ui.c 2018-12-10 18:35:31.000000000 +0100 +++ new/ipset-7.2/src/ui.c 2019-06-10 12:10:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) +/* Copyright 2007-2010 Jozsef Kadlecsik ([email protected]) * * 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
