Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Use signed integer in ipv6_skip_exthdr() called from nf_confirm(). Reported by static analysis tooling, patch from Florian Westphal.
2) Missing set type checks in nf_tables: Validate that set declaration matches the an existing set type, otherwise bail out with EEXIST. Currently, nf_tables silently accepts the re-declaration with a different type but it bails out later with EINVAL when the user adds entries to the set. This fix is relatively large because it requires two preparation patches that are included in this batch.
3) Do not ignore updates of timeout and gc_interval parameters in existing sets.
4) Fix a hang when 0/0 subnets is added to a hash:net,port,net type of ipset. Except hash:net,port,net and hash:net,iface, the set types don't support 0/0 and the auxiliary functions rely on this fact. So 0/0 needs a special handling in hash:net,port,net which was missing (hash:net,iface was not affected by this bug), from Jozsef Kadlecsik.
5) When adding/deleting large number of elements in one step in ipset, it can take a reasonable amount of time and can result in soft lockup errors. This patch is a complete rework of the previous version in order to use a smaller internal batch limit and at the same time removing the external hard limit to add arbitrary number of elements in one step. Also from Jozsef Kadlecsik.
Except for patch #1, which fixes a bug introduced in the previous net-next development cycle, anything else has been broken for several releases.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit 19e72b064fc32cd58f6fc0b1eb64ac2e4f770e76:
net: fec: check the return value of build_skb() (2022-12-20 11:33:24 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git HEAD
for you to fetch changes up to 5e29dc36bd5e2166b834ceb19990d9e68a734d7d:
netfilter: ipset: Rework long task execution when adding/deleting entries (2023-01-02 15:10:05 +0100)
----------------------------------------------------------------
Florian Westphal (1):
netfilter: conntrack: fix ipv6 exthdr error check
Jozsef Kadlecsik (2):
netfilter: ipset: fix hash:net,port,net hang with /0 subnet
netfilter: ipset: Rework long task execution when adding/deleting entries
Pablo Neira Ayuso (4):
netfilter: nf_tables: consolidate set description
netfilter: nf_tables: add function to create set stateful expressions
netfilter: nf_tables: perform type checking for existing sets
netfilter: nf_tables: honor set timeout and garbage collection updates
include/linux/netfilter/ipset/ip_set.h | 2 +- include/net/netfilter/nf_tables.h | 25 ++- net/netfilter/ipset/ip_set_core.c | 7 +- net/netfilter/ipset/ip_set_hash_ip.c | 14 +- net/netfilter/ipset/ip_set_hash_ipmark.c | 13 +- net/netfilter/ipset/ip_set_hash_ipport.c | 13 +- net/netfilter/ipset/ip_set_hash_ipportip.c | 13 +- net/netfilter/ipset/ip_set_hash_ipportnet.c | 13 +- net/netfilter/ipset/ip_set_hash_net.c | 17 +- net/netfilter/ipset/ip_set_hash_netiface.c | 15 +- net/netfilter/ipset/ip_set_hash_netnet.c | 23 +-- net/netfilter/ipset/ip_set_hash_netport.c | 19 +- net/netfilter/ipset/ip_set_hash_netportnet.c | 40 ++-- net/netfilter/nf_conntrack_proto.c | 7 +- net/netfilter/nf_tables_api.c | 261 ++++++++++++++++++--------- 15 files changed, 293 insertions(+), 189 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/7 netfilter: conntrack: fix ipv6 exthdr error check
From: Florian Westphal <[email protected]>
smatch warnings:net/netfilter/nf_conntrack_proto.c:167 nf_confirm() warn: unsigned 'protoff' is never less than zero.
We need to check if ipv6_skip_exthdr() returned an error, but protoff is unsigned. Use a signed integer for this.
--- net/netfilter/nf_conntrack_proto.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_proto.c +5 -2
@@ -141,6 +141,7 @@ unsigned int nf_confirm(void *priv,struct nf_conn *ct;bool seqadj_needed;__be16 frag_off; +int start;u8 pnum; ct =nf_ct_get (skb, &ctinfo);
@@ -163,9 +164,11 @@ unsigned int nf_confirm(void *priv,break ;case NFPROTO_IPV6 : pnum =ipv6_hdr (skb)->nexthdr; - protoff =ipv6_skip_exthdr (skb,sizeof (struct ipv6hdr ), &pnum, &frag_off); -if (protoff <0 || (frag_off &htons (~0x7 )) !=0 ) + start =ipv6_skip_exthdr (skb,sizeof (struct ipv6hdr ), &pnum, &frag_off); +if (start <0 || (frag_off &htons (~0x7 )) !=0 )return nf_conntrack_confirm (skb); + + protoff = start;break ;default :return nf_conntrack_confirm (skb);
Signature · 1 line
2.30.2
Re: [PATCH net 1/7] netfilter: conntrack: fix ipv6 exthdr error check
This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <[email protected]>:
Quoted 9 lines · On Mon, 2 Jan 2023 17:40:19 +0100 you wrote:
From: Florian Westphal <[email protected]>
smatch warnings:
net/netfilter/nf_conntrack_proto.c:167nf_confirm()warn: unsigned 'protoff' is never less than zero.We need to check if
ipv6_skip_exthdr()returned an error, but protoff is unsigned. Use a signed integer for this.[...]
Here is the summary with links:
- [net,1/7] netfilter: conntrack: fix ipv6 exthdr error check
https://git.kernel.org/netdev/net/c/5eb119da94ac - [net,2/7] netfilter: nf_tables: consolidate set description https://git.kernel.org/netdev/net/c/bed4a63ea4ae - [net,3/7] netfilter: nf_tables: add function to create set stateful expressions https://git.kernel.org/netdev/net/c/a8fe4154fa5a - [net,4/7] netfilter: nf_tables: perform type checking for existing sets https://git.kernel.org/netdev/net/c/f6594c372afd - [net,5/7] netfilter: nf_tables: honor set timeout and garbage collection updates https://git.kernel.org/netdev/net/c/123b99619cca - [net,6/7] netfilter: ipset: fix hash:net,port,net hang with /0 subnet https://git.kernel.org/netdev/net/c/a31d47be64b9 - [net,7/7] netfilter: ipset: Rework long task execution when adding/deleting entries https://git.kernel.org/netdev/net/c/5e29dc36bd5e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH 2/7 netfilter: nf_tables: consolidate set description
In reply to Pablo Neira AyusoAdd the following fields to the set description:
- key type
- data type
- object type
- policy
- gc_int: garbage collection interval)
- timeout: element timeout
This prepares for stricter set type checks on updates in a follow up patch.
--- include/net/netfilter/nf_tables.h | 12 +++++++ net/netfilter/nf_tables_api.c | 58 +++++++++++++++---------------- 2 files changed, 40 insertions(+), 30 deletions(-)
include/net/netfilter/nf_tables.h +12 -0
@@ -312,17 +312,29 @@ struct nft_set_iter {/** * struct nft_set_desc - description of set elements * +* @ktype: key type * @klen: key length +* @dtype: data type * @dlen: data length +* @objtype: object type +* @flags: flags * @size: number of set elements +* @policy: set policy +* @gc_int: garbage collector interval * @field_len: length of each field in concatenation, bytes * @field_count: number of concatenated fields in element * @expr: set must support for expressions */ struct nft_set_desc { +u32 ktype;unsigned int klen; +u32 dtype;unsigned int dlen; +u32 objtype;unsigned int size; +u32 policy; +u32 gc_int; +u64 timeout;u8 field_len[NFT_REG32_COUNT ];u8 field_count;bool expr;
net/netfilter/nf_tables_api.c +28 -30
146 lines not on this page · raw message
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/7 netfilter: nf_tables: add function to create set stateful expressions
In reply to Pablo Neira AyusoAdd a helper function to allocate and initialize the stateful expressions that are defined in a set.
This patch allows to reuse this code from the set update path, to check that type of the update matches the existing set in the kernel.
--- net/netfilter/nf_tables_api.c | 106 ++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 38 deletions(-)
net/netfilter/nf_tables_api.c +68 -38
@@ -4388,6 +4388,59 @@ static int nf_tables_set_desc_parse(struct nft_set_desc *desc,return err; } +static int nft_set_expr_alloc (struct nft_ctx *ctx,struct nft_set *set, +const struct nlattr *const *nla, +struct nft_expr **exprs,int *num_exprs, +u32 flags) +{ +struct nft_expr *expr; +int err, i; + +if (nla[NFTA_SET_EXPR ]) { + expr =nft_set_elem_expr_alloc (ctx, set, nla[NFTA_SET_EXPR ]); +if (IS_ERR (expr)) { + err =PTR_ERR (expr); + goto err_set_expr_alloc; + } + exprs[0 ] = expr; + (*num_exprs)++; + }else if (nla[NFTA_SET_EXPRESSIONS ]) { +struct nlattr *tmp; +int left; + +if (!(flags &NFT_SET_EXPR )) { + err = -EINVAL ; + goto err_set_expr_alloc; + } + i =0 ; +nla_for_each_nested (tmp, nla[NFTA_SET_EXPRESSIONS ], left) { +if (i ==NFT_SET_EXPR_MAX ) { + err = -E2BIG ; + goto err_set_expr_alloc; + } +if (nla_type (tmp) !=NFTA_LIST_ELEM ) { + err = -EINVAL ; + goto err_set_expr_alloc; + } + expr =nft_set_elem_expr_alloc (ctx, set, tmp); +if (IS_ERR (expr)) { + err =PTR_ERR (expr); + goto err_set_expr_alloc; + } + exprs[i++] = expr; + (*num_exprs)++; + } + } + +return 0 ; + +err_set_expr_alloc: +for (i =0 ; i < *num_exprs; i++) +nft_expr_destroy (ctx, exprs[i]); + +return err; +} +static int nf_tables_newset (struct sk_buff *skb,const struct nfnl_info *info,const struct nlattr *const nla[]) {
@@ -4395,7 +4448,6 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,u8 genmask =nft_genmask_next (info->net);u8 family = info->nfmsg->nfgen_family;const struct nft_set_ops *ops; -struct nft_expr *expr =NULL ;struct net *net = info->net;struct nft_set_desc desc;struct nft_table *table;
@@ -4403,6 +4455,7 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,struct nft_set *set;struct nft_ctx ctx;size_t alloc_size; +int num_exprs =0 ;char *name;int err, i;u16 udlen;
@@ -4529,6 +4582,8 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,return PTR_ERR (set); } }else { +struct nft_expr *exprs[NFT_SET_EXPR_MAX ] = {}; +if (info->nlh->nlmsg_flags &NLM_F_EXCL ) {NL_SET_BAD_ATTR (extack, nla[NFTA_SET_NAME ]);return -EEXIST ;
@@ -4536,6 +4591,13 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,if (info->nlh->nlmsg_flags &NLM_F_REPLACE )return -EOPNOTSUPP ; + err =nft_set_expr_alloc (&ctx, set, nla, exprs, &num_exprs, flags); +if (err <0 ) +return err; + +for (i =0 ; i < num_exprs; i++) +nft_expr_destroy (&ctx, exprs[i]); +return 0 ; }
@@ -4603,43 +4665,11 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,if (err <0 ) goto err_set_init; -if (nla[NFTA_SET_EXPR ]) { - expr =nft_set_elem_expr_alloc (&ctx, set, nla[NFTA_SET_EXPR ]); -if (IS_ERR (expr)) { - err =PTR_ERR (expr); - goto err_set_expr_alloc; - } - set->exprs[0 ] = expr; - set->num_exprs++; - }else if (nla[NFTA_SET_EXPRESSIONS ]) { -struct nft_expr *expr; -struct nlattr *tmp; -int left; - -if (!(flags &NFT_SET_EXPR )) { - err = -EINVAL ; - goto err_set_expr_alloc; - } - i =0 ; -nla_for_each_nested (tmp, nla[NFTA_SET_EXPRESSIONS ], left) { -if (i ==NFT_SET_EXPR_MAX ) { - err = -E2BIG ; - goto err_set_expr_alloc; - } -if (nla_type (tmp) !=NFTA_LIST_ELEM ) { - err = -EINVAL ; - goto err_set_expr_alloc; - } - expr =nft_set_elem_expr_alloc (&ctx, set, tmp); -if (IS_ERR (expr)) { - err =PTR_ERR (expr); - goto err_set_expr_alloc; - } - set->exprs[i++] = expr; - set->num_exprs++; - } - } + err =nft_set_expr_alloc (&ctx, set, nla, set->exprs, &num_exprs, flags); +if (err <0 ) + goto err_set_destroy; + set->num_exprs = num_exprs; set->handle =nf_tables_alloc_handle (table); err =nft_trans_set_add (&ctx,NFT_MSG_NEWSET , set);
@@ -4653,7 +4683,7 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info, err_set_expr_alloc:for (i =0 ; i < set->num_exprs; i++)nft_expr_destroy (&ctx, set->exprs[i]); - +err_set_destroy: ops->destroy (set); err_set_init:kfree (set->name);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/7 netfilter: nf_tables: perform type checking for existing sets
In reply to Pablo Neira AyusoIf a ruleset declares a set name that matches an existing set in the kernel, then validate that this declaration really refers to the same set, otherwise bail out with EEXIST.
Currently, the kernel reports success when adding a set that already exists in the kernel. This usually results in EINVAL errors at a later stage, when the user adds elements to the set, if the set declaration mismatches the existing set representation in the kernel.
Add a new function to check that the set declaration really refers to the same existing set in the kernel.
--- net/netfilter/nf_tables_api.c | 36 ++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +35 -1
@@ -4441,6 +4441,34 @@ static int nft_set_expr_alloc(struct nft_ctx *ctx, struct nft_set *set,return err; } +static bool nft_set_is_same (const struct nft_set *set, +const struct nft_set_desc *desc, +struct nft_expr *exprs[],u32 num_exprs,u32 flags) +{ +int i; + +if (set->ktype != desc->ktype || + set->dtype != desc->dtype || + set->flags != flags || + set->klen != desc->klen || + set->dlen != desc->dlen || + set->field_count != desc->field_count || + set->num_exprs != num_exprs) +return false; + +for (i =0 ; i < desc->field_count; i++) { +if (set->field_len[i] != desc->field_len[i]) +return false; + } + +for (i =0 ; i < num_exprs; i++) { +if (set->exprs[i]->ops != exprs[i]->ops) +return false; + } + +return true; +} +static int nf_tables_newset (struct sk_buff *skb,const struct nfnl_info *info,const struct nlattr *const nla[]) {
@@ -4595,10 +4623,16 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,if (err <0 )return err; + err =0 ; +if (!nft_set_is_same (set, &desc, exprs, num_exprs, flags)) { +NL_SET_BAD_ATTR (extack, nla[NFTA_SET_NAME ]); + err = -EEXIST ; + } +for (i =0 ; i < num_exprs; i++)nft_expr_destroy (&ctx, exprs[i]); -return 0 ; +return err; }if (!(info->nlh->nlmsg_flags &NLM_F_CREATE ))
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 5/7 netfilter: nf_tables: honor set timeout and garbage collection updates
In reply to Pablo Neira AyusoSet timeout and garbage collection interval updates are ignored on updates. Add transaction to update global set element timeout and garbage collection interval.
--- include/net/netfilter/nf_tables.h | 13 ++++++- net/netfilter/nf_tables_api.c | 63 ++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 19 deletions(-)
include/net/netfilter/nf_tables.h +12 -1
@@ -597,7 +597,9 @@ void *nft_set_catchall_gc(const struct nft_set *set);static inline unsigned long nft_set_gc_interval (const struct nft_set *set) { -return set->gc_int ?msecs_to_jiffies (set->gc_int) :HZ ; +u32 gc_int =READ_ONCE (set->gc_int); + +return gc_int ?msecs_to_jiffies (gc_int) :HZ ; }/**
@@ -1570,6 +1572,9 @@ struct nft_trans_rule {struct nft_trans_set {struct nft_set *set;u32 set_id; +u32 gc_int; +u64 timeout; +bool update;bool bound; };
@@ -1579,6 +1584,12 @@ struct nft_trans_set { (((struct nft_trans_set *)trans->data)->set_id)#define nft_trans_set_bound (trans) \ (((struct nft_trans_set *)trans->data)->bound) +#define nft_trans_set_update (trans) \ + (((struct nft_trans_set *)trans->data)->update) +#define nft_trans_set_timeout (trans) \ + (((struct nft_trans_set *)trans->data)->timeout) +#define nft_trans_set_gc_int (trans) \ + (((struct nft_trans_set *)trans->data)->gc_int)struct nft_trans_chain {bool update;
net/netfilter/nf_tables_api.c +45 -18
132 lines not on this page · raw message
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 6/7 netfilter: ipset: fix hash:net,port,net hang with /0 subnet
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
The hash:net,port,net set type supports /0 subnets. However, the patch commit 5f7b51bf09baca8e titled "netfilter: ipset: Limit the maximal range of consecutive elements to add/delete" did not take into account it and resulted in an endless loop. The bug is actually older but the patch 5f7b51bf09baca8e brings it out earlier.
Handle /0 subnets properly in hash:net,port,net set types.
--- net/netfilter/ipset/ip_set_hash_netportnet.c | 40 ++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-)
net/netfilter/ipset/ip_set_hash_netportnet.c +21 -19
@@ -173,17 +173,26 @@ hash_netportnet4_kadt(struct ip_set *set, const struct sk_buff *skb,return adtfn (set, &e, &ext, &opt->ext, opt->cmdflags); } +static u32 +hash_netportnet4_range_to_cidr (u32 from,u32 to,u8 *cidr) +{ +if (from ==0 && to ==UINT_MAX ) { + *cidr =0 ; +return to; + } +return ip_set_range_to_cidr (from, to, cidr); +} +static int hash_netportnet4_uadt (struct ip_set *set,struct nlattr *tb[],enum ipset_adt adt,u32 *lineno,u32 flags,bool retried) { -const struct hash_netportnet4 *h = set->data; +struct hash_netportnet4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_netportnet4_elem e = { };struct ip_set_ext ext =IP_SET_INIT_UEXT (set);u32 ip =0 , ip_to =0 , p =0 , port, port_to; -u32 ip2_from =0 , ip2_to =0 , ip2, ipn; -u64 n =0 , m =0 ; +u32 ip2_from =0 , ip2_to =0 , ip2, i =0 ;bool with_ports = false;int ret;
@@ -285,19 +294,6 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[], }else {ip_set_mask_from_to (ip2_from, ip2_to, e.cidr[1 ]); } - ipn = ip; -do { - ipn =ip_set_range_to_cidr (ipn, ip_to, &e.cidr[0 ]); - n++; - }while (ipn++ < ip_to); - ipn = ip2_from; -do { - ipn =ip_set_range_to_cidr (ipn, ip2_to, &e.cidr[1 ]); - m++; - }while (ipn++ < ip2_to); - -if (n*m*(port_to - port +1 ) >IPSET_MAX_RANGE ) -return -ERANGE ;if (retried) { ip =ntohl (h->next.ip[0 ]);
@@ -310,13 +306,19 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[], do { e.ip[0] = htonl(ip); - ip = ip_set_range_to_cidr(ip, ip_to, &e.cidr[0]); + ip = hash_netportnet4_range_to_cidr(ip, ip_to, &e.cidr[0]); for (; p <= port_to; p++) { e.port = htons(p); do { + i++; e.ip[1] = htonl(ip2); - ip2 = ip_set_range_to_cidr(ip2, ip2_to, - &e.cidr[1]); + if (i > IPSET_MAX_RANGE) { + hash_netportnet4_data_next(&h->next, + &e); + return -ERANGE; + } + ip2 = hash_netportnet4_range_to_cidr(ip2, + ip2_to, &e.cidr[1]); ret = adtfn(set, &e, &ext, &ext, flags); if (ret && !ip_set_eexist(ret, flags)) return ret;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 7/7 netfilter: ipset: Rework long task execution when adding/deleting entries
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
When adding/deleting large number of elements in one step in ipset, it can take a reasonable amount of time and can result in soft lockup errors. The patch 5f7b51bf09ba ("netfilter: ipset: Limit the maximal range of consecutive elements to add/delete") tried to fix it by limiting the max elements to process at all. However it was not enough, it is still possible that we get hung tasks. Lowering the limit is not reasonable, so the approach in this patch is as follows: rely on the method used at resizing sets and save the state when we reach a smaller internal batch limit, unlock/lock and proceed from the saved state. Thus we can avoid long continuous tasks and at the same time removed the limit to add/delete large number of elements in one step.
The nfnl mutex is held during the whole operation which prevents one to issue other ipset commands in parallel.
--- include/linux/netfilter/ipset/ip_set.h | 2 +- net/netfilter/ipset/ip_set_core.c | 7 ++++--- net/netfilter/ipset/ip_set_hash_ip.c | 14 ++++++------- net/netfilter/ipset/ip_set_hash_ipmark.c | 13 ++++++------ net/netfilter/ipset/ip_set_hash_ipport.c | 13 ++++++------ net/netfilter/ipset/ip_set_hash_ipportip.c | 13 ++++++------ net/netfilter/ipset/ip_set_hash_ipportnet.c | 13 +++++++----- net/netfilter/ipset/ip_set_hash_net.c | 17 +++++++-------- net/netfilter/ipset/ip_set_hash_netiface.c | 15 ++++++-------- net/netfilter/ipset/ip_set_hash_netnet.c | 23 +++++++-------------- net/netfilter/ipset/ip_set_hash_netport.c | 19 +++++++---------- 11 files changed, 68 insertions(+), 81 deletions(-)
include/linux/netfilter/ipset/ip_set.h +1 -1
@@ -197,7 +197,7 @@ struct ip_set_region { };/* Max range where every element is added/deleted in one step */ -#define IPSET_MAX_RANGE (1<<20) +#define IPSET_MAX_RANGE (1<<14)/* The max revision number supported by any set type + 1 */ #define IPSET_REVISION_MAX 9
net/netfilter/ipset/ip_set_core.c +4 -3
@@ -1698,9 +1698,10 @@ call_ad(struct net *net, struct sock *ctnl, struct sk_buff *skb, ret = set->variant->uadt (set, tb, adt, &lineno, flags, retried);ip_set_unlock (set); retried = true; - }while (ret == -EAGAIN && - set->variant->resize && - (ret = set->variant->resize (set, retried)) ==0 ); + }while (ret == -ERANGE || + (ret == -EAGAIN && + set->variant->resize && + (ret = set->variant->resize (set, retried)) ==0 ));if (!ret || (ret == -IPSET_ERR_EXIST && eexist))return 0 ;
net/netfilter/ipset/ip_set_hash_ip.c +7 -7
@@ -100,11 +100,11 @@ static int hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_ip4 *h = set->data; + struct hash_ip4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_ip4_elem e = {0 };struct ip_set_ext ext =IP_SET_INIT_UEXT (set); -u32 ip =0 , ip_to =0 , hosts; +u32 ip =0 , ip_to =0 , hosts, i =0 ;int ret =0 ;if (tb[IPSET_ATTR_LINENO ])
@@ -149,14 +149,14 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], hosts = h->netmask ==32 ?1 :2 << (32 - h->netmask -1 ); -/* 64bit division is not allowed on 32bit */ -if (((u64 )ip_to - ip +1 ) >> (32 - h->netmask) >IPSET_MAX_RANGE ) -return -ERANGE ; -if (retried) ip =ntohl (h->next.ip); -for (; ip <= ip_to;) { +for (; ip <= ip_to; i++) { e.ip =htonl (ip); +if (i >IPSET_MAX_RANGE ) { +hash_ip4_data_next (&h->next, &e); +return -ERANGE ; + } ret =adtfn (set, &e, &ext, &ext, flags);if (ret && !ip_set_eexist (ret, flags))return ret;
net/netfilter/ipset/ip_set_hash_ipmark.c +7 -6
@@ -97,11 +97,11 @@ static int hash_ipmark4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_ipmark4 *h = set->data; + struct hash_ipmark4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_ipmark4_elem e = { };struct ip_set_ext ext =IP_SET_INIT_UEXT (set); -u32 ip, ip_to =0 ; +u32 ip, ip_to =0 , i =0 ;int ret;if (tb[IPSET_ATTR_LINENO ])
@@ -148,13 +148,14 @@ hash_ipmark4_uadt(struct ip_set *set, struct nlattr *tb[],ip_set_mask_from_to (ip, ip_to, cidr); } -if (((u64 )ip_to - ip +1 ) >IPSET_MAX_RANGE ) -return -ERANGE ; -if (retried) ip =ntohl (h->next.ip); -for (; ip <= ip_to; ip++) { +for (; ip <= ip_to; ip++, i++) { e.ip =htonl (ip); +if (i >IPSET_MAX_RANGE ) { +hash_ipmark4_data_next (&h->next, &e); +return -ERANGE ; + } ret =adtfn (set, &e, &ext, &ext, flags);if (ret && !ip_set_eexist (ret, flags))
net/netfilter/ipset/ip_set_hash_ipport.c +7 -6
@@ -112,11 +112,11 @@ static int hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_ipport4 *h = set->data; + struct hash_ipport4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_ipport4_elem e = { .ip =0 };struct ip_set_ext ext =IP_SET_INIT_UEXT (set); -u32 ip, ip_to =0 , p =0 , port, port_to; +u32 ip, ip_to =0 , p =0 , port, port_to, i =0 ;bool with_ports = false;int ret;
@@ -184,17 +184,18 @@ hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[],swap (port, port_to); } -if (((u64 )ip_to - ip +1 )*(port_to - port +1 ) >IPSET_MAX_RANGE ) -return -ERANGE ; -if (retried) ip =ntohl (h->next.ip);for (; ip <= ip_to; ip++) { p = retried && ip ==ntohl (h->next.ip) ?ntohs (h->next.port) : port; -for (; p <= port_to; p++) { +for (; p <= port_to; p++, i++) { e.ip =htonl (ip); e.port =htons (p); +if (i >IPSET_MAX_RANGE ) { +hash_ipport4_data_next (&h->next, &e); +return -ERANGE ; + } ret =adtfn (set, &e, &ext, &ext, flags);if (ret && !ip_set_eexist (ret, flags))
net/netfilter/ipset/ip_set_hash_ipportip.c +7 -6
@@ -108,11 +108,11 @@ static int hash_ipportip4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_ipportip4 *h = set->data; + struct hash_ipportip4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_ipportip4_elem e = { .ip =0 };struct ip_set_ext ext =IP_SET_INIT_UEXT (set); -u32 ip, ip_to =0 , p =0 , port, port_to; +u32 ip, ip_to =0 , p =0 , port, port_to, i =0 ;bool with_ports = false;int ret;
@@ -180,17 +180,18 @@ hash_ipportip4_uadt(struct ip_set *set, struct nlattr *tb[],swap (port, port_to); } -if (((u64 )ip_to - ip +1 )*(port_to - port +1 ) >IPSET_MAX_RANGE ) -return -ERANGE ; -if (retried) ip =ntohl (h->next.ip);for (; ip <= ip_to; ip++) { p = retried && ip ==ntohl (h->next.ip) ?ntohs (h->next.port) : port; -for (; p <= port_to; p++) { +for (; p <= port_to; p++, i++) { e.ip =htonl (ip); e.port =htons (p); +if (i >IPSET_MAX_RANGE ) { +hash_ipportip4_data_next (&h->next, &e); +return -ERANGE ; + } ret =adtfn (set, &e, &ext, &ext, flags);if (ret && !ip_set_eexist (ret, flags))
net/netfilter/ipset/ip_set_hash_ipportnet.c +8 -5
@@ -160,12 +160,12 @@ static int hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_ipportnet4 *h = set->data; + struct hash_ipportnet4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_ipportnet4_elem e = { .cidr =HOST_MASK -1 };struct ip_set_ext ext =IP_SET_INIT_UEXT (set);u32 ip =0 , ip_to =0 , p =0 , port, port_to; -u32 ip2_from =0 , ip2_to =0 , ip2; +u32 ip2_from =0 , ip2_to =0 , ip2, i =0 ;bool with_ports = false;u8 cidr;int ret;
@@ -253,9 +253,6 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[],swap (port, port_to); } -if (((u64 )ip_to - ip +1 )*(port_to - port +1 ) >IPSET_MAX_RANGE ) -return -ERANGE ; - ip2_to = ip2_from;if (tb[IPSET_ATTR_IP2_TO ]) { ret =ip_set_get_hostipaddr4 (tb[IPSET_ATTR_IP2_TO ], &ip2_to);
@@ -282,9 +279,15 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[],for (; p <= port_to; p++) { e.port =htons (p); do { + i++; e.ip2 = htonl(ip2); ip2 = ip_set_range_to_cidr(ip2, ip2_to, &cidr); e.cidr = cidr - 1; + if (i > IPSET_MAX_RANGE) { + hash_ipportnet4_data_next(&h->next, + &e); + return -ERANGE; + } ret = adtfn(set, &e, &ext, &ext, flags); if (ret && !ip_set_eexist(ret, flags))
net/netfilter/ipset/ip_set_hash_net.c +7 -10
@@ -136,11 +136,11 @@ static int hash_net4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_net4 *h = set->data; + struct hash_net4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_net4_elem e = { .cidr =HOST_MASK };struct ip_set_ext ext =IP_SET_INIT_UEXT (set); -u32 ip =0 , ip_to =0 , ipn, n =0 ; +u32 ip =0 , ip_to =0 , i =0 ;int ret;if (tb[IPSET_ATTR_LINENO ])
@@ -188,19 +188,16 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[],if (ip +UINT_MAX == ip_to)return -IPSET_ERR_HASH_RANGE ; } - ipn = ip; -do { - ipn =ip_set_range_to_cidr (ipn, ip_to, &e.cidr); - n++; - }while (ipn++ < ip_to); - -if (n >IPSET_MAX_RANGE ) -return -ERANGE ;if (retried) ip =ntohl (h->next.ip); do { + i++; e.ip = htonl(ip); + if (i > IPSET_MAX_RANGE) { + hash_net4_data_next(&h->next, &e); + return -ERANGE; + } ip = ip_set_range_to_cidr(ip, ip_to, &e.cidr); ret = adtfn(set, &e, &ext, &ext, flags); if (ret && !ip_set_eexist(ret, flags))
net/netfilter/ipset/ip_set_hash_netiface.c +6 -9
@@ -202,7 +202,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],ipset_adtfn adtfn = set->variant->adt[adt];struct hash_netiface4_elem e = { .cidr =HOST_MASK , .elem =1 };struct ip_set_ext ext =IP_SET_INIT_UEXT (set); -u32 ip =0 , ip_to =0 , ipn, n =0 ; +u32 ip =0 , ip_to =0 , i =0 ;int ret;if (tb[IPSET_ATTR_LINENO ])
@@ -256,19 +256,16 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[], }else {ip_set_mask_from_to (ip, ip_to, e.cidr); } - ipn = ip; -do { - ipn =ip_set_range_to_cidr (ipn, ip_to, &e.cidr); - n++; - }while (ipn++ < ip_to); - -if (n >IPSET_MAX_RANGE ) -return -ERANGE ;if (retried) ip =ntohl (h->next.ip); do { + i++; e.ip = htonl(ip); + if (i > IPSET_MAX_RANGE) { + hash_netiface4_data_next(&h->next, &e); + return -ERANGE; + } ip = ip_set_range_to_cidr(ip, ip_to, &e.cidr); ret = adtfn(set, &e, &ext, &ext, flags);
net/netfilter/ipset/ip_set_hash_netnet.c +7 -16
@@ -166,13 +166,12 @@ static int hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_netnet4 *h = set->data; + struct hash_netnet4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_netnet4_elem e = { };struct ip_set_ext ext =IP_SET_INIT_UEXT (set);u32 ip =0 , ip_to =0 ; -u32 ip2 =0 , ip2_from =0 , ip2_to =0 , ipn; -u64 n =0 , m =0 ; +u32 ip2 =0 , ip2_from =0 , ip2_to =0 , i =0 ;int ret;if (tb[IPSET_ATTR_LINENO ])
@@ -248,19 +247,6 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[], }else {ip_set_mask_from_to (ip2_from, ip2_to, e.cidr[1 ]); } - ipn = ip; -do { - ipn =ip_set_range_to_cidr (ipn, ip_to, &e.cidr[0 ]); - n++; - }while (ipn++ < ip_to); - ipn = ip2_from; -do { - ipn =ip_set_range_to_cidr (ipn, ip2_to, &e.cidr[1 ]); - m++; - }while (ipn++ < ip2_to); - -if (n*m >IPSET_MAX_RANGE ) -return -ERANGE ;if (retried) { ip =ntohl (h->next.ip[0 ]);
@@ -273,7 +259,12 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[], e.ip[0 ] =htonl (ip); ip =ip_set_range_to_cidr (ip, ip_to, &e.cidr[0 ]); do { + i++; e.ip[1] = htonl(ip2); + if (i > IPSET_MAX_RANGE) { + hash_netnet4_data_next(&h->next, &e); + return -ERANGE; + } ip2 = ip_set_range_to_cidr(ip2, ip2_to, &e.cidr[1]); ret = adtfn(set, &e, &ext, &ext, flags); if (ret && !ip_set_eexist(ret, flags))
net/netfilter/ipset/ip_set_hash_netport.c +7 -12
@@ -154,12 +154,11 @@ static int hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { - const struct hash_netport4 *h = set->data; + struct hash_netport4 *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_netport4_elem e = { .cidr =HOST_MASK -1 };struct ip_set_ext ext =IP_SET_INIT_UEXT (set); -u32 port, port_to, p =0 , ip =0 , ip_to =0 , ipn; -u64 n =0 ; +u32 port, port_to, p =0 , ip =0 , ip_to =0 , i =0 ;bool with_ports = false;u8 cidr;int ret;
@@ -236,14 +235,6 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[], }else {ip_set_mask_from_to (ip, ip_to, e.cidr +1 ); } - ipn = ip; -do { - ipn =ip_set_range_to_cidr (ipn, ip_to, &cidr); - n++; - }while (ipn++ < ip_to); - -if (n*(port_to - port +1 ) >IPSET_MAX_RANGE ) -return -ERANGE ;if (retried) { ip =ntohl (h->next.ip);
@@ -255,8 +246,12 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[], e.ip =htonl (ip); ip =ip_set_range_to_cidr (ip, ip_to, &cidr); e.cidr = cidr -1 ; -for (; p <= port_to; p++) { +for (; p <= port_to; p++, i++) { e.port =htons (p); +if (i >IPSET_MAX_RANGE ) { +hash_netport4_data_next (&h->next, &e); +return -ERANGE ; + } ret =adtfn (set, &e, &ext, &ext, flags);if (ret && !ip_set_eexist (ret, flags))return ret;
Signature · 1 line
2.30.2