Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for your net tree, they are: 1) Revisit warning logic when not applying default helper assignment. Jiri Kosina considers we are breaking existing setups and not warning our users accordinly now that automatic helper assignment has been turned off by default. So let's make him happy by spotting the warning by when we find a helper but we cannot attach, instead of warning on the former deprecated behaviour. Patch from Jiri Kosina. 2) Two patches to fix regression in ctnetlink interfaces with nfnetlink_queue. Specifically, perform more relaxed in CTA_STATUS and do not bail out if CTA_HELP indicates the same helper that we already have. Patches from Kevin Cernekee. 3) A couple of bugfixes for ipset via Jozsef Kadlecsik. Due to wrong index logic in hash set types and null pointer exception in the list:set type. 4) hashlimit bails out with correct userspace parameters due to wrong arithmetics in the code that avoids "divide by zero" when transforming the userspace timing in milliseconds to token credits. Patch from Alban Browaeys. 5) Fix incorrect NFQA_VLAN_MAX definition, patch from Ken-ichirou MATSUZAWA. 6) Don't not declare nfnetlink batch error list as static, since this may be used by several subsystems at the same time. Patch from Liping Zhang. ====================
Showing the changes to include/uapi/linux (2 of 8 files). Show all
Unified · Split
| @@ -82,6 +82,10 @@ enum ip_conntrack_status { · 81 unmodified lines | ||
| 82 | 82 | IPS_DYING_BIT = 9, |
| 83 | 83 | IPS_DYING = (1 << IPS_DYING_BIT), |
| 84 | 84 | |
| 85 | + /* Bits that cannot be altered from userland. */ | |
| 86 | + IPS_UNCHANGEABLE_MASK = (IPS_NAT_DONE_MASK | IPS_NAT_MASK | | |
| 87 | + IPS_EXPECTED | IPS_CONFIRMED | IPS_DYING), | |
| 88 | + | |
| 85 | 89 | /* Connection has fixed timeout. */ |
| 86 | 90 | IPS_FIXED_TIMEOUT_BIT = 10, |
| 87 | 91 | IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT), |
| @@ -36,7 +36,7 @@ enum nfqnl_vlan_attr { · 35 unmodified lines | ||
| 36 | 36 | NFQA_VLAN_TCI, /* __be16 skb htons(vlan_tci) */ |
| 37 | 37 | __NFQA_VLAN_MAX, |
| 38 | 38 | }; |
| 39 | −#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX + 1) | |
| 39 | +#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX - 1) | |
| 40 | 40 | |
| 41 | 41 | enum nfqnl_attr_type { |
| 42 | 42 | NFQA_UNSPEC, |