Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3d7a089 authored by David S. Miller's avatar David S. Miller
Browse files

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



Pablo Neira Ayuso says:

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

The following patchset contains Netfilter fixes for net:

1) Spurious warning when loading rules using the physdev match,
   from Todd Seidelmann.

2) Fix FTP conntrack helper debugging output, from Thomas Jarosch.

3) Restore per-netns nf_conntrack_{acct,helper,timeout} sysctl knobs,
   from Florian Westphal.

4) Clear skbuff timestamp from the flowtable datapath, also from Florian.

5) Fix incorrect byteorder of NFT_META_BRI_IIFVPROTO, from wenxu.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 94880a5b daf1de90

net/bridge/netfilter/nft_meta_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr, 
			goto err;



		br_vlan_get_proto(br_dev, &p_proto);

		nft_reg_store16(dest, p_proto);

		nft_reg_store16(dest, htons(p_proto));

		return;

	}

	default:

net/netfilter/nf_conntrack_ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int find_pattern(const char *data, size_t dlen, 
		i++;

	}



	pr_debug("Skipped up to `%c'!\n", skip);

	pr_debug("Skipped up to 0x%hhx delimiter!\n", skip);



	*numoff = i;

	*numlen = getnum(data + i, dlen - i, cmd, term, numoff);

net/netfilter/nf_conntrack_standalone.c

+5 −0
Original line number Diff line number Diff line
@@ -1037,8 +1037,13 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net) 
	table[NF_SYSCTL_CT_COUNT].data = &net->ct.count;

	table[NF_SYSCTL_CT_CHECKSUM].data = &net->ct.sysctl_checksum;

	table[NF_SYSCTL_CT_LOG_INVALID].data = &net->ct.sysctl_log_invalid;

	table[NF_SYSCTL_CT_ACCT].data = &net->ct.sysctl_acct;

	table[NF_SYSCTL_CT_HELPER].data = &net->ct.sysctl_auto_assign_helper;

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	table[NF_SYSCTL_CT_EVENTS].data = &net->ct.sysctl_events;

#endif

#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP

	table[NF_SYSCTL_CT_TIMESTAMP].data = &net->ct.sysctl_tstamp;

#endif

	table[NF_SYSCTL_CT_PROTO_TIMEOUT_GENERIC].data = &nf_generic_pernet(net)->timeout;

	table[NF_SYSCTL_CT_PROTO_TIMEOUT_ICMP].data = &nf_icmp_pernet(net)->timeout;

net/netfilter/nf_flow_table_ip.c

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb, 
{

	skb_orphan(skb);

	skb_dst_set_noref(skb, dst);

	skb->tstamp = 0;

	dst_output(state->net, state->sk, skb);

	return NF_STOLEN;

}
@@ -284,6 +283,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, 
	flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;

	iph = ip_hdr(skb);

	ip_decrease_ttl(iph);

	skb->tstamp = 0;



	if (unlikely(dst_xfrm(&rt->dst))) {

		memset(skb->cb, 0, sizeof(struct inet_skb_parm));
@@ -512,6 +512,7 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, 
	flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;

	ip6h = ipv6_hdr(skb);

	ip6h->hop_limit--;

	skb->tstamp = 0;



	if (unlikely(dst_xfrm(&rt->dst))) {

		memset(skb->cb, 0, sizeof(struct inet6_skb_parm));

net/netfilter/xt_physdev.c

+2 −4
Original line number Diff line number Diff line
@@ -101,10 +101,8 @@ static int physdev_mt_check(const struct xt_mtchk_param *par) 
	if (info->bitmask & (XT_PHYSDEV_OP_OUT | XT_PHYSDEV_OP_ISOUT) &&

	    (!(info->bitmask & XT_PHYSDEV_OP_BRIDGED) ||

	     info->invert & XT_PHYSDEV_OP_BRIDGED) &&

	    par->hook_mask & ((1 << NF_INET_LOCAL_OUT) |

	    (1 << NF_INET_FORWARD) | (1 << NF_INET_POST_ROUTING))) {

	    par->hook_mask & (1 << NF_INET_LOCAL_OUT)) {

		pr_info_ratelimited("--physdev-out and --physdev-is-out only supported in the FORWARD and POSTROUTING chains with bridged traffic\n");

		if (par->hook_mask & (1 << NF_INET_LOCAL_OUT))

		return -EINVAL;

	}