Skip to content

: Netfilter update for 2.6.19

Patrick McHardy netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest39 patches 13 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/39: remove unused include fileinclude/linux/netfilter_logging.h+0 -330 replies
2/39: kill listhelp.hinclude/linux/netfilter/x_tables.h net/bridge/netfilter/ebtables.c net/ipv4/netfilter/arp_tables.c +11 more+237 -2811 reply
3/39: xt_conntrack: clean up overly long linesnet/netfilter/xt_conntrack.c+98 -810 replies
4/39: ipt_TCPMSS: reformatnet/ipv4/netfilter/ipt_TCPMSS.c+31 -273 replies
5/39: ipt_TCPMSS: remove impossible conditionnet/ipv4/netfilter/ipt_TCPMSS.c+0 -72 replies
6/39: ipt_TCPMSS: misc cleanupnet/ipv4/netfilter/ipt_TCPMSS.c+2 -340 replies
7/39: xt_limit: don't reset state on unrelated rule updatesnet/netfilter/xt_limit.c+8 -80 replies
8/39: ip6table_mangle: reroute when nfmark changes in NF_IP6_LOCAL_OUTinclude/linux/netfilter_ipv6.h include/net/ip6_route.h net/ipv6/netfilter/ip6table_mangle.c+3 -80 replies
9/39: x_tables: small check_entry & module_refcount cleanupnet/ipv4/netfilter/arp_tables.c net/ipv4/netfilter/ip_tables.c net/ipv6/netfilter/ip6_tables.c+3 -30 replies
10/39: ctnetlink: simplify the code to dump the conntrack tablenet/ipv4/netfilter/ip_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c+20 -1100 replies
11/39: conntrack: fix race condition in early_dropnet/ipv4/netfilter/ip_conntrack_core.c net/netfilter/nf_conntrack_core.c+14 -54 replies
12/39: ipt_TTL: fix checksum update bugnet/ipv4/netfilter/ipt_TTL.c+2 -20 replies
13/39: ip6t_HL: remove write-only variablenet/ipv6/netfilter/ip6t_HL.c+1 -50 replies
14/39: xt_policy: remove dups in .familynet/netfilter/xt_policy.c+0 -20 replies
15/39: TCP conntrack: improve dead connection detectioninclude/linux/netfilter/nf_conntrack_tcp.h net/ipv4/netfilter/ip_conntrack_proto_tcp.c net/netfilter/nf_conntrack_proto_tcp.c+7 -20 replies
16/39: make some netfilter globals __read_mostlynet/ipv4/netfilter/ip_conntrack_core.c net/ipv4/netfilter/ip_queue.c net/ipv6/netfilter/ip6_queue.c +1 more+16 -160 replies
17/39: ip_tables: fix module refcount leaks in compat error pathsnet/ipv4/netfilter/ip_tables.c+27 -120 replies
18/39: ip_tables: revision support for compat codenet/ipv4/netfilter/ip_tables.c+3 -20 replies
19/39: x_tables: simplify compat APIinclude/linux/netfilter/x_tables.h net/ipv4/netfilter/ip_tables.c net/netfilter/x_tables.c+151 -1850 replies
20/39: xt_mark: add compat conversion functionsnet/netfilter/xt_mark.c+36 -00 replies
21/39: xt_MARK: add compat conversion functionsnet/netfilter/xt_MARK.c+34 -00 replies
22/39: xt_connmark: add compat conversion functionsnet/netfilter/xt_connmark.c+36 -00 replies
23/39: xt_CONNMARK: add compat conversion functionsnet/netfilter/xt_CONNMARK.c+36 -00 replies
24/39: xt_limit: add compat conversion functionsnet/netfilter/xt_limit.c+49 -00 replies
25/39: ipt_hashlimit: add compat conversion functionsnet/ipv4/netfilter/ipt_hashlimit.c+29 -00 replies
26/39: PPTP conntrack: fix whitespace errorsinclude/linux/netfilter_ipv4/ip_conntrack_pptp.h net/ipv4/netfilter/ip_conntrack_helper_pptp.c net/ipv4/netfilter/ip_conntrack_proto_gre.c +2 more+121 -1210 replies
27/39: PPTP conntrack: get rid of unnecessary byte order conversionsinclude/linux/netfilter_ipv4/ip_conntrack_pptp.h include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h include/linux/netfilter_ipv4/ip_nat_pptp.h +3 more+50 -502 replies
28/39: PPTP conntrack: remove dead codenet/ipv4/netfilter/ip_nat_helper_pptp.c+2 -140 replies
29/39: PPTP conntrack: remove more dead codenet/ipv4/netfilter/ip_conntrack_helper_pptp.c+2 -150 replies
30/39: PPTP conntrack: fix header definitionsinclude/linux/netfilter_ipv4/ip_conntrack_pptp.h net/ipv4/netfilter/ip_conntrack_helper_pptp.c+6 -50 replies
31/39: PPTP conntrack: remove unnecessary cid/pcid header pointersnet/ipv4/netfilter/ip_conntrack_helper_pptp.c+28 -280 replies
32/39: PPTP conntrack: simplify expectation handlinginclude/linux/netfilter_ipv4/ip_conntrack_pptp.h net/ipv4/netfilter/ip_conntrack_helper_pptp.c net/ipv4/netfilter/ip_nat_helper_pptp.c+35 -1170 replies
33/39: PPTP conntrack: consolidate header size checksnet/ipv4/netfilter/ip_conntrack_helper_pptp.c+22 -430 replies
34/39: PPTP conntrack: consolidate header parsingnet/ipv4/netfilter/ip_conntrack_helper_pptp.c+47 -720 replies
35/39: PPTP conntrack: clean up debugging cruftnet/ipv4/netfilter/ip_conntrack_helper_pptp.c+51 -770 replies
36/39: PPTP conntrack: check call ID before changing statenet/ipv4/netfilter/ip_conntrack_helper_pptp.c+13 -190 replies
37/39: PPTP conntrack: fix PPTP_IN_CALL message typesnet/ipv4/netfilter/ip_conntrack_helper_pptp.c net/ipv4/netfilter/ip_nat_helper_pptp.c+8 -60 replies
38/39: PPTP conntrack: fix GRE keymap leaknet/ipv4/netfilter/ip_conntrack_helper_pptp.c+1 -00 replies
39/39: PPTP conntrack: fix another GRE keymap leakinclude/linux/netfilter_ipv4/ip_conntrack_helper.h net/ipv4/netfilter/ip_conntrack_core.c net/ipv4/netfilter/ip_conntrack_helper_pptp.c+9 -100 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [NETFILTER 00/39]: Netfilter update for 2.6.19

Hi Dave,

following is another netfilter update for 2.6.19, consisting of a number of random cleanup and fixes, a rework of the iptables compat code including compat support for (AFAICT) all missing matches/targets and some cleanup and fixes for the PPtP connection tracking helper. Some of these should also go in -stable, I'll prepare backports and send them seperately.

Please apply, thanks.

 include/linux/netfilter/nf_conntrack_tcp.h            |    1 
 include/linux/netfilter/x_tables.h                    |   33 
 include/linux/netfilter_ipv4/ip_conntrack_helper.h    |    2 
 include/linux/netfilter_ipv4/ip_conntrack_pptp.h      |   45 -
 include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h |   22 
 include/linux/netfilter_ipv4/ip_nat_pptp.h            |    4 
 include/linux/netfilter_ipv6.h                        |    1 
 include/linux/netfilter_logging.h                     |   33 
 include/net/ip6_route.h                               |    2 
 net/bridge/netfilter/ebtables.c                       |   76 +-
 net/ipv4/netfilter/arp_tables.c                       |    4 
 net/ipv4/netfilter/ip_conntrack_core.c                |  209 ++---
 net/ipv4/netfilter/ip_conntrack_helper_pptp.c         |  634 +++++++-----------
 net/ipv4/netfilter/ip_conntrack_netlink.c             |   63 -
 net/ipv4/netfilter/ip_conntrack_proto_gre.c           |   52 -
 net/ipv4/netfilter/ip_conntrack_proto_tcp.c           |    4 
 net/ipv4/netfilter/ip_conntrack_standalone.c          |    1 
 net/ipv4/netfilter/ip_nat_core.c                      |    4 
 net/ipv4/netfilter/ip_nat_helper.c                    |    4 
 net/ipv4/netfilter/ip_nat_helper_pptp.c               |  210 ++---
 net/ipv4/netfilter/ip_nat_proto_gre.c                 |   22 
 net/ipv4/netfilter/ip_nat_rule.c                      |    4 
 net/ipv4/netfilter/ip_nat_standalone.c                |    4 
 net/ipv4/netfilter/ip_queue.c                         |    8 
 net/ipv4/netfilter/ip_tables.c                        |  161 +---
 net/ipv4/netfilter/ipt_TCPMSS.c                       |  101 --
 net/ipv4/netfilter/ipt_TTL.c                          |    4 
 net/ipv4/netfilter/ipt_hashlimit.c                    |   29 
 net/ipv6/netfilter/ip6_queue.c                        |    8 
 net/ipv6/netfilter/ip6_tables.c                       |    5 
 net/ipv6/netfilter/ip6t_HL.c                          |    6 
 net/ipv6/netfilter/ip6table_mangle.c                  |    8 
 net/netfilter/nf_conntrack_core.c                     |  205 ++---
 net/netfilter/nf_conntrack_netlink.c                  |   67 -
 net/netfilter/nf_conntrack_proto_tcp.c                |    4 
 net/netfilter/nf_conntrack_standalone.c               |    1 
 net/netfilter/x_tables.c                              |  209 +++--
 net/netfilter/xt_CONNMARK.c                           |   36 +
 net/netfilter/xt_MARK.c                               |   34 
 net/netfilter/xt_connmark.c                           |   36 +
 net/netfilter/xt_conntrack.c                          |  179 ++---
 net/netfilter/xt_limit.c                              |   65 +
 net/netfilter/xt_mark.c                               |   36 +
 net/netfilter/xt_policy.c                             |    2 
 44 files changed, 1238 insertions(+), 1400 deletions(-)

Alexey Dobriyan:
[NETFILTER]: xt_policy: remove dups in .family

Brian Haley:
[NETFILTER]: make some netfilter globals __read_mostly

Dmitry Mishin:
[NETFILTER]: x_tables: small check_entry & module_refcount cleanup

George Hansper:
[NETFILTER]: TCP conntrack: improve dead connection detection

Pablo Neira Ayuso:
[NETFILTER]: ctnetlink: simplify the code to dump the conntrack table [NETFILTER]: conntrack: fix race condition in early_drop

Patrick McHardy:
[NETFILTER]: remove unused include file
[NETFILTER]: kill listhelp.h
[NETFILTER]: xt_conntrack: clean up overly long lines [NETFILTER]: ipt_TCPMSS: reformat
[NETFILTER]: ipt_TCPMSS: remove impossible condition [NETFILTER]: ipt_TCPMSS: misc cleanup
[NETFILTER]: xt_limit: don't reset state on unrelated rule updates [NETFILTER]: ip6table_mangle: reroute when nfmark changes in NF_IP6_LOCAL_OUT [NETFILTER]: ipt_TTL: fix checksum update bug
[NETFILTER]: ip6t_HL: remove write-only variable
[NETFILTER]: ip_tables: fix module refcount leaks in compat error paths [NETFILTER]: ip_tables: revision support for compat code [NETFILTER]: x_tables: simplify compat API
[NETFILTER]: xt_mark: add compat conversion functions [NETFILTER]: xt_MARK: add compat conversion functions [NETFILTER]: xt_connmark: add compat conversion functions [NETFILTER]: xt_CONNMARK: add compat conversion functions [NETFILTER]: xt_limit: add compat conversion functions [NETFILTER]: ipt_hashlimit: add compat conversion functions [NETFILTER]: PPTP conntrack: fix whitespace errors
[NETFILTER]: PPTP conntrack: get rid of unnecessary byte order conversions [NETFILTER]: PPTP conntrack: remove dead code
[NETFILTER]: PPTP conntrack: remove more dead code
[NETFILTER]: PPTP conntrack: fix header definitions
[NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers [NETFILTER]: PPTP conntrack: simplify expectation handling [NETFILTER]: PPTP conntrack: consolidate header size checks [NETFILTER]: PPTP conntrack: consolidate header parsing [NETFILTER]: PPTP conntrack: clean up debugging cruft [NETFILTER]: PPTP conntrack: check call ID before changing state [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types [NETFILTER]: PPTP conntrack: fix GRE keymap leak
[NETFILTER]: PPTP conntrack: fix another GRE keymap leak