diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-03 16:03:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-03 16:03:18 -0700 |
| commit | f2e0b29a9ac7766799360eb6cd72ba83889f616a (patch) | |
| tree | 3938e99db72370682f4dfc8bb5f2b65b19da477c /net/netfilter/x_tables.c | |
| parent | c23cf402d0bb069310ce75bbf2758ff9c23fbe73 (diff) | |
| parent | 77a92189ecfd061616ad531d386639aab7baaad9 (diff) | |
| download | linux-f2e0b29a9ac7766799360eb6cd72ba83889f616a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
1) UAF in chain binding support from previous batch, from Dan Carpenter.
2) Queue up delayed work to expire connections with no destination,
from Andrew Sy Kim.
3) Use fallthrough pseudo-keyword, from Gustavo A. R. Silva.
4) Replace HTTP links with HTTPS, from Alexander A. Klimov.
5) Remove superfluous null header checks in ip6tables, from
Gaurav Singh.
6) Add extended netlink error reporting for expression.
7) Report EEXIST on overlapping chain, set elements and flowtable
devices.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/x_tables.c')
| -rw-r--r-- | net/netfilter/x_tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 91bf6635ea9ee..73d343abd1152 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -1571,7 +1571,7 @@ static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos, trav->curr = trav->curr->next; if (trav->curr != trav->head) break; - /* fall through */ + fallthrough; default: return NULL; } |