Hi Oliver,
On Wed, 11 Sep 2013, Oliver wrote:
> From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
>
> This fixes a serious bug affecting all hash types with a net element -
> specifically, if a CIDR value is deleted such that none of the same size
> exist any more, all larger (less-specific) values will then fail to
> match. Adding back any prefix with a CIDR equal to or more specific than
> the one deleted will fix it.
>
> Steps to reproduce:
> ipset -N test hash:net
> ipset -A test 1.1.0.0/16
> ipset -A test 2.2.2.0/24
> ipset -T test 1.1.1.1 #1.1.1.1 IS in set
> ipset -D test 2.2.2.0/24
> ipset -T test 1.1.1.1 #1.1.1.1 IS NOT in set
>
> This is due to the fact that the nets counter was unconditionally
> decremented prior to the iteration that shifts up the entries. Now, we
> first check if there is a proceeding entry and if not, decrement it and
> return. Otherwise, we proceed to iterate and then clean up the last
> element afterwards.
>
> Signed-off-by: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> kernel/net/netfilter/ipset/ip_set_hash_gen.h | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h
> index 7a5b776..6599ea8 100644
> --- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h
> +++ b/kernel/net/netfilter/ipset/ip_set_hash_gen.h
> @@ -307,19 +307,20 @@ mtype_add_cidr(struct htype *h, u8 cidr, u8 nets_length, u8 n)
> static void
> mtype_del_cidr(struct htype *h, u8 cidr, u8 nets_length, u8 n)
> {
> - u8 i, j;
> + u8 i, j, net_end = nets_length - 1;
>
> - for (i = 0; i < nets_length - 1 && h->nets[i].cidr[n] != cidr; i++)
> + for (i = 0; i < net_end && h->nets[i].cidr[n] != cidr; i++)
> ;
> - h->nets[i].nets[n]--;
> -
> - if (h->nets[i].nets[n] != 0)
> + if (h->nets[i].nets[n] > 1 || i == net_end || !h->nets[i + 1].nets[n]) {
> + h->nets[i].nets[n]--;
> return;
> + }
If you restored the original code in the part above, then the whole thing
could be collapsed into starting the next loop from j = i + 1 (and
changing the indices in the for body accordingly).
> - for (j = i; j < nets_length - 1 && h->nets[j].nets[n]; j++) {
> + for (j = i; j < net_end && h->nets[j].nets[n]; j++) {
> h->nets[j].cidr[n] = h->nets[j + 1].cidr[n];
> h->nets[j].nets[n] = h->nets[j + 1].nets[n];
> }
> + h->nets[j].nets[n] = 0;
Here the checking of the value "j" is missing.
> }
> #endif
Best regards,
Jozsef
-
E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxxxxxx
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
