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

Commit 23416e23 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/IPVS fixes for net

The following patchset contains Netfilter/IPVS fixes for your net tree,
they are:

1) When using IPVS in direct-routing mode, normal traffic from the LVS
   host to a back-end server is sometimes incorrectly NATed on the way
   back into the LVS host. Patch to fix this from Julian Anastasov.

2) Calm down clang compilation warning in ctnetlink due to type
   mismatch, from Matthias Kaehlcke.

3) Do not re-setup NAT for conntracks that are already confirmed, this
   is fixing a problem that was introduced in the previous nf-next batch.
   Patch from Liping Zhang.

4) Do not allow conntrack helper removal from userspace cthelper
   infrastructure if already in used. This comes with an initial patch
   to introduce nf_conntrack_helper_put() that is required by this fix.
   From Liping Zhang.

5) Zero the pad when copying data to userspace, otherwise iptables fails
   to remove rules. This is a follow up on the patchset that sorts out
   the internal match/target structure pointer leak to userspace. Patch
   from the same author, Willem de Bruijn. This also comes with a build
   failure when CONFIG_COMPAT is not on, coming in the last patch of
   this series.

6) SYNPROXY crashes with conntrack entries that are created via
   ctnetlink, more specifically via conntrackd state sync. Patch from
   Eric Leblond.

7) RCU safe iteration on set element dumping in nf_tables, from
   Liping Zhang.

8) Missing sanitization of immediate date for the bitwise and cmp
   expressions in nf_tables.

9) Refcounting logic for chain and objects from set elements does not
   integrate into the nf_tables 2-phase commit protocol.

10) Missing sanitization of target verdict in ebtables arpreply target,
    from Gao Feng.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8b4822de 751a9c76

include/linux/netfilter/x_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ int xt_match_to_user(const struct xt_entry_match *m, 
int xt_target_to_user(const struct xt_entry_target *t,

		      struct xt_entry_target __user *u);

int xt_data_to_user(void __user *dst, const void *src,

		    int usersize, int size);

		    int usersize, int size, int aligned_size);



void *xt_copy_counters_from_user(const void __user *user, unsigned int len,

				 struct xt_counters_info *info, bool compat);

include/linux/netfilter_bridge/ebtables.h

+5 −0
Original line number Diff line number Diff line
@@ -125,4 +125,9 @@ extern unsigned int ebt_do_table(struct sk_buff *skb, 
/* True if the target is not a standard target */

#define INVALID_TARGET (info->target < -NUM_STANDARD_TARGETS || info->target >= 0)



static inline bool ebt_invalid_target(int target)

{

	return (target < -NUM_STANDARD_TARGETS || target >= 0);

}



#endif

include/net/netfilter/nf_conntrack_helper.h

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#ifndef _NF_CONNTRACK_HELPER_H

#define _NF_CONNTRACK_HELPER_H

#include <linux/refcount.h>

#include <net/netfilter/nf_conntrack.h>

#include <net/netfilter/nf_conntrack_extend.h>

#include <net/netfilter/nf_conntrack_expect.h>
@@ -26,6 +27,7 @@ struct nf_conntrack_helper { 
	struct hlist_node hnode;	/* Internal use. */



	char name[NF_CT_HELPER_NAME_LEN]; /* name of the module */

	refcount_t refcnt;

	struct module *me;		/* pointer to self */

	const struct nf_conntrack_expect_policy *expect_policy;
@@ -79,6 +81,8 @@ struct nf_conntrack_helper *__nf_conntrack_helper_find(const char *name, 
struct nf_conntrack_helper *nf_conntrack_helper_try_module_get(const char *name,

							       u16 l3num,

							       u8 protonum);

void nf_conntrack_helper_put(struct nf_conntrack_helper *helper);



void nf_ct_helper_init(struct nf_conntrack_helper *helper,

		       u16 l3num, u16 protonum, const char *name,

		       u16 default_port, u16 spec_port, u32 id,

include/net/netfilter/nf_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct nft_data_desc { 
int nft_data_init(const struct nft_ctx *ctx,

		  struct nft_data *data, unsigned int size,

		  struct nft_data_desc *desc, const struct nlattr *nla);

void nft_data_uninit(const struct nft_data *data, enum nft_data_types type);

void nft_data_release(const struct nft_data *data, enum nft_data_types type);

int nft_data_dump(struct sk_buff *skb, int attr, const struct nft_data *data,

		  enum nft_data_types type, unsigned int len);

net/bridge/netfilter/ebt_arpreply.c

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ static int ebt_arpreply_tg_check(const struct xt_tgchk_param *par) 
	if (e->ethproto != htons(ETH_P_ARP) ||

	    e->invflags & EBT_IPROTO)

		return -EINVAL;

	if (ebt_invalid_target(info->target))

		return -EINVAL;



	return 0;

}