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

Commit a71bdbfa authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Fix reported memory size for hash:* types 



The calculation of the full allocated memory did not take
into account the size of the base hash bucket structure at some
places.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 9be37d2a

net/netfilter/ipset/ip_set_hash_gen.h

+9 −7
Original line number Original line Diff line number Diff line
@@ -85,6 +85,8 @@ struct htable { 
};

};





#define hbucket(h, i)		((h)->bucket[i])

#define hbucket(h, i)		((h)->bucket[i])

#define ext_size(n, dsize)	\

	(sizeof(struct hbucket) + (n) * (dsize))





#ifndef IPSET_NET_COUNT

#ifndef IPSET_NET_COUNT

#define IPSET_NET_COUNT		1

#define IPSET_NET_COUNT		1
@@ -519,7 +521,7 @@ mtype_expire(struct ip_set *set, struct htype *h) 
				d++;

				d++;

			}

			}

			tmp->pos = d;

			tmp->pos = d;

			set->ext_size -= AHASH_INIT_SIZE * dsize;

			set->ext_size -= ext_size(AHASH_INIT_SIZE, dsize);

			rcu_assign_pointer(hbucket(t, i), tmp);

			rcu_assign_pointer(hbucket(t, i), tmp);

			kfree_rcu(n, rcu);

			kfree_rcu(n, rcu);

		}

		}
@@ -625,7 +627,7 @@ mtype_resize(struct ip_set *set, bool retried) 
					goto cleanup;

					goto cleanup;

				}

				}

				m->size = AHASH_INIT_SIZE;

				m->size = AHASH_INIT_SIZE;

				extsize = sizeof(*m) + AHASH_INIT_SIZE * dsize;

				extsize = ext_size(AHASH_INIT_SIZE, dsize);

				RCU_INIT_POINTER(hbucket(t, key), m);

				RCU_INIT_POINTER(hbucket(t, key), m);

			} else if (m->pos >= m->size) {

			} else if (m->pos >= m->size) {

				struct hbucket *ht;

				struct hbucket *ht;
@@ -645,7 +647,7 @@ mtype_resize(struct ip_set *set, bool retried) 
				memcpy(ht, m, sizeof(struct hbucket) +

				memcpy(ht, m, sizeof(struct hbucket) +

					      m->size * dsize);

					      m->size * dsize);

				ht->size = m->size + AHASH_INIT_SIZE;

				ht->size = m->size + AHASH_INIT_SIZE;

				extsize += AHASH_INIT_SIZE * dsize;

				extsize += ext_size(AHASH_INIT_SIZE, dsize);

				kfree(m);

				kfree(m);

				m = ht;

				m = ht;

				RCU_INIT_POINTER(hbucket(t, key), ht);

				RCU_INIT_POINTER(hbucket(t, key), ht);
@@ -727,7 +729,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext, 
		if (!n)

		if (!n)

			return -ENOMEM;

			return -ENOMEM;

		n->size = AHASH_INIT_SIZE;

		n->size = AHASH_INIT_SIZE;

		set->ext_size += sizeof(*n) + AHASH_INIT_SIZE * set->dsize;

		set->ext_size += ext_size(AHASH_INIT_SIZE, set->dsize);

		goto copy_elem;

		goto copy_elem;

	}

	}

	for (i = 0; i < n->pos; i++) {

	for (i = 0; i < n->pos; i++) {
@@ -791,7 +793,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext, 
		memcpy(n, old, sizeof(struct hbucket) +

		memcpy(n, old, sizeof(struct hbucket) +

		       old->size * set->dsize);

		       old->size * set->dsize);

		n->size = old->size + AHASH_INIT_SIZE;

		n->size = old->size + AHASH_INIT_SIZE;

		set->ext_size += AHASH_INIT_SIZE * set->dsize;

		set->ext_size += ext_size(AHASH_INIT_SIZE, set->dsize);

	}

	}





copy_elem:

copy_elem:
@@ -883,7 +885,7 @@ mtype_del(struct ip_set *set, void *value, const struct ip_set_ext *ext, 
				k++;

				k++;

		}

		}

		if (n->pos == 0 && k == 0) {

		if (n->pos == 0 && k == 0) {

			set->ext_size -= sizeof(*n) + n->size * dsize;

			set->ext_size -= ext_size(n->size, dsize);

			rcu_assign_pointer(hbucket(t, key), NULL);

			rcu_assign_pointer(hbucket(t, key), NULL);

			kfree_rcu(n, rcu);

			kfree_rcu(n, rcu);

		} else if (k >= AHASH_INIT_SIZE) {

		} else if (k >= AHASH_INIT_SIZE) {
@@ -902,7 +904,7 @@ mtype_del(struct ip_set *set, void *value, const struct ip_set_ext *ext, 
				k++;

				k++;

			}

			}

			tmp->pos = k;

			tmp->pos = k;

			set->ext_size -= AHASH_INIT_SIZE * dsize;

			set->ext_size -= ext_size(AHASH_INIT_SIZE, dsize);

			rcu_assign_pointer(hbucket(t, key), tmp);

			rcu_assign_pointer(hbucket(t, key), tmp);

			kfree_rcu(n, rcu);

			kfree_rcu(n, rcu);

		}

		}