[linux-next] LinuxNextTracking branch, master, updated. next-20190816 - linux-merge - lists.open-mesh.org

16 Aug 2019

The following commit has been merged in the master branch:
commit c162610c7db2e9611a7b3ec806f9c97fcfec0b0b
Merge: b753c5a7f99f390fc100de18647ce0dcacdceafc 105333435b4f3b21ffc325f32fae17719310db64
Author: Jakub Kicinski jakub.kicinski@netronome.com
Date:   Tue Aug 13 18:22:57 2019 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
    Netfilter/IPVS updates for net-next
The following patchset contains Netfilter/IPVS updates for net-next:
1) Rename mss field to mss_option field in synproxy, from Fernando Mancera.
2) Use SYSCTL_{ZERO,ONE} definitions in conntrack, from Matteo Croce.
3) More strict validation of IPVS sysctl values, from Junwei Hu.
4) Remove unnecessary spaces after on the right hand side of assignments,
       from yangxingwu.
5) Add offload support for bitwise operation.
6) Extend the nft_offload_reg structure to store immediate date.
7) Collapse several ip_set header files into ip_set.h, from
       Jeremy Sowden.
8) Make netfilter headers compile with CONFIG_KERNEL_HEADER_TEST=y,
       from Jeremy Sowden.
9) Fix several sparse warnings due to missing prototypes, from
       Valdis Kletnieks.
10) Use static lock initialiser to ensure connlabel spinlock is
        initialized on boot time to fix sched/act_ct.c, patch
        from Florian Westphal.
    ====================
Signed-off-by: Jakub Kicinski jakub.kicinski@netronome.com
diff --combined include/net/netfilter/nf_tables_offload.h
index bffd51a90343,4977fbe7ed08..8a5969d9b80b

--- a/include/net/netfilter/nf_tables_offload.h
+++ b/include/net/netfilter/nf_tables_offload.h
@@@ -9,6 -9,7 +9,7 @@@ struct nft_offload_reg 
    u32		len;
    u32		base_offset;
    u32		offset;
+ 	struct nft_data data;
    struct nft_data	mask;
  };
@@@ -63,10 -64,6 +64,10 @@@ struct nft_rule
  struct nft_flow_rule *nft_flow_rule_create(const struct nft_rule *rule);
  void nft_flow_rule_destroy(struct nft_flow_rule *flow);
  int nft_flow_rule_offload_commit(struct net *net);
 +void nft_indr_block_get_and_ing_cmd(struct net_device *dev,
 +				    flow_indr_block_bind_cb_t *cb,
 +				    void *cb_priv,
 +				    enum flow_block_command command);
#define NFT_OFFLOAD_MATCH(__key, __base, __field, __len, __reg)		\
    (__reg)->base_offset	=					\
diff --combined net/netfilter/ipvs/ip_vs_ctl.c
index 145c8c992927,3d5922c47ec2..8b48e7ce1c2c
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@@ -262,7 -262,7 +262,7 @@@ static inline unsigned in
  ip_vs_svc_hashkey(struct netns_ipvs *ipvs, int af, unsigned int proto,
    	  const union nf_inet_addr *addr, __be16 port)
  {
 -	register unsigned int porth = ntohs(port);
 +	unsigned int porth = ntohs(port);
    __be32 addr_fold = addr->ip;
    __u32 ahash;
@@@ -493,7 -493,7 +493,7 @@@ static inline unsigned int ip_vs_rs_has
    				    const union nf_inet_addr *addr,
    				    __be16 port)
  {
 -	register unsigned int porth = ntohs(port);
 +	unsigned int porth = ntohs(port);
    __be32 addr_fold = addr->ip;
#ifdef CONFIG_IP_VS_IPV6
@@@ -1737,12 -1737,18 +1737,18 @@@ proc_do_defense_mode(struct ctl_table *
    int val = *valp;
    int rc;
- 	rc = proc_dointvec(table, write, buffer, lenp, ppos);
+ 	struct ctl_table tmp = {
+ 		.data = &val,
+ 		.maxlen = sizeof(int),
+ 		.mode = table->mode,
+ 	};
+ 
+ 	rc = proc_dointvec(&tmp, write, buffer, lenp, ppos);
    if (write && (*valp != val)) {
- 		if ((*valp < 0) || (*valp > 3)) {
- 			/* Restore the correct value */
- 			*valp = val;
+ 		if (val < 0 || val > 3) {
+ 			rc = -EINVAL;
    	} else {
+ 			*valp = val;
    		update_defense_level(ipvs);
    	}
    }
@@@ -1756,33 -1762,20 +1762,20 @@@ proc_do_sync_threshold(struct ctl_tabl
    int *valp = table->data;
    int val[2];
    int rc;
+ 	struct ctl_table tmp = {
+ 		.data = &val,
+ 		.maxlen = table->maxlen,
+ 		.mode = table->mode,
+ 	};
- 	/* backup the value first */
    memcpy(val, valp, sizeof(val));
- 
- 	rc = proc_dointvec(table, write, buffer, lenp, ppos);
- 	if (write && (valp[0] < 0 || valp[1] < 0 ||
- 	    (valp[0] >= valp[1] && valp[1]))) {
- 		/* Restore the correct value */
- 		memcpy(valp, val, sizeof(val));
- 	}
- 	return rc;
- }
- 
- static int
- proc_do_sync_mode(struct ctl_table *table, int write,
- 		     void __user *buffer, size_t *lenp, loff_t *ppos)
- {
- 	int *valp = table->data;
- 	int val = *valp;
- 	int rc;
- 
- 	rc = proc_dointvec(table, write, buffer, lenp, ppos);
- 	if (write && (*valp != val)) {
- 		if ((*valp < 0) || (*valp > 1)) {
- 			/* Restore the correct value */
- 			*valp = val;
- 		}
+ 	rc = proc_dointvec(&tmp, write, buffer, lenp, ppos);
+ 	if (write) {
+ 		if (val[0] < 0 || val[1] < 0 ||
+ 		    (val[0] >= val[1] && val[1]))
+ 			rc = -EINVAL;
+ 		else
+ 			memcpy(valp, val, sizeof(val));
    }
    return rc;
  }
@@@ -1795,12 -1788,18 +1788,18 @@@ proc_do_sync_ports(struct ctl_table *ta
    int val = *valp;
    int rc;
- 	rc = proc_dointvec(table, write, buffer, lenp, ppos);
+ 	struct ctl_table tmp = {
+ 		.data = &val,
+ 		.maxlen = sizeof(int),
+ 		.mode = table->mode,
+ 	};
+ 
+ 	rc = proc_dointvec(&tmp, write, buffer, lenp, ppos);
    if (write && (*valp != val)) {
- 		if (*valp < 1 || !is_power_of_2(*valp)) {
- 			/* Restore the correct value */
+ 		if (val < 1 || !is_power_of_2(val))
+ 			rc = -EINVAL;
+ 		else
    		*valp = val;
- 		}
    }
    return rc;
  }
@@@ -1860,7 -1859,9 +1859,9 @@@ static struct ctl_table vs_vars[] = 
    	.procname	= "sync_version",
    	.maxlen		= sizeof(int),
    	.mode		= 0644,
- 		.proc_handler	= proc_do_sync_mode,
+ 		.proc_handler	= proc_dointvec_minmax,
+ 		.extra1		= SYSCTL_ZERO,
+ 		.extra2		= SYSCTL_ONE,
    },
    {
    	.procname	= "sync_ports",
-- 
LinuxNextTracking

    