Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for net: 1) Set VLAN tag in tcp reset/icmp unreachable packets to reject connections in the bridge family, from Michael Braun. 2) Incorrect subcounter flag update in ipset, from Phil Sutter. 3) Possible buffer overflow in the pptp conntrack helper, based on patch from Dan Carpenter. 4) Restore userspace conntrack helper hook logic that broke after hook consolidation rework. 5) Unbreak userspace conntrack helper registration via nfnetlink_cthelper. ====================
Showing the changes to include/linux (1 of 7 files). Show all
Unified · Split
| @@ -10,7 +10,7 @@ · 9 unmodified lines | |||
| 10 | #include <net/netfilter/nf_conntrack_expect.h> | 10 | #include <net/netfilter/nf_conntrack_expect.h> |
| 11 | #include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> | 11 | #include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> |
| 12 | 12 | ||
| 13 | extern const char *const pptp_msg_name[]; | 13 | extern const char *const pptp_msg_name(u_int16_t msg); |
| 14 | 14 | ||
| 15 | /* state of the control session */ | 15 | /* state of the control session */ |
| 16 | enum pptp_ctrlsess_state { | 16 | enum pptp_ctrlsess_state { |