Commit 594850ca authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf 



Pablo Neira Ayuso says:

====================
Netfilter fixes for net

1) Update debugging in IPVS tcp protocol handler to make it easier
   to understand, from longguang.yue

2) Update TCP tracker to deal with keepalive packet after
   re-registration, from Franceso Ruggeri.

3) Missing IP6SKB_FRAGMENTED from netfilter fragment reassembly,
   from Georg Kohmann.

4) Fix bogus packet drop in ebtables nat extensions, from
   Thimothee Cocault.

5) Fix typo in flowtable documentation.

6) Reset skb timestamp in nft_fwd_netdev.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d2775984 c77761c8

Documentation/networking/nf_flowtable.rst

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ More reading 
This documentation is based on the LWN.net articles [1]_\ [2]_. Rafal Milecki

also made a very complete and comprehensive summary called "A state of network

acceleration" that describes how things were before this infrastructure was

mailined [3]_ and it also makes a rough summary of this work [4]_.

mainlined [3]_ and it also makes a rough summary of this work [4]_.



.. [1] https://lwn.net/Articles/738214/

.. [2] https://lwn.net/Articles/742164/

include/net/netfilter/nf_tables.h

+6 −0
Original line number Diff line number Diff line
@@ -891,6 +891,12 @@ static inline struct nft_expr *nft_expr_last(const struct nft_rule *rule) 
	return (struct nft_expr *)&rule->data[rule->dlen];

}



static inline bool nft_expr_more(const struct nft_rule *rule,

				 const struct nft_expr *expr)

{

	return expr != nft_expr_last(rule) && expr->ops;

}



static inline struct nft_userdata *nft_userdata(const struct nft_rule *rule)

{

	return (void *)&rule->data[rule->dlen];

net/bridge/netfilter/ebt_dnat.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par) 
{

	const struct ebt_nat_info *info = par->targinfo;



	if (skb_ensure_writable(skb, ETH_ALEN))

	if (skb_ensure_writable(skb, 0))

		return EBT_DROP;



	ether_addr_copy(eth_hdr(skb)->h_dest, info->mac);

net/bridge/netfilter/ebt_redirect.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par) 
{

	const struct ebt_redirect_info *info = par->targinfo;



	if (skb_ensure_writable(skb, ETH_ALEN))

	if (skb_ensure_writable(skb, 0))

		return EBT_DROP;



	if (xt_hooknum(par) != NF_BR_BROUTING)

net/bridge/netfilter/ebt_snat.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ ebt_snat_tg(struct sk_buff *skb, const struct xt_action_param *par) 
{

	const struct ebt_nat_info *info = par->targinfo;



	if (skb_ensure_writable(skb, ETH_ALEN * 2))

	if (skb_ensure_writable(skb, 0))

		return EBT_DROP;



	ether_addr_copy(eth_hdr(skb)->h_source, info->mac);

CRA Git | Maintained and supported by SUSTech CRA and CCSE