Commit e562d860 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: kill nft_data_cmp() 



Only needlessly complicates things due to requiring specific argument
types. Use memcmp directly.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fad136ea

include/net/netfilter/nf_tables.h

+0 −7
Original line number Diff line number Diff line
@@ -69,13 +69,6 @@ struct nft_regs { 
	};

};



static inline int nft_data_cmp(const struct nft_data *d1,

			       const struct nft_data *d2,

			       unsigned int len)

{

	return memcmp(d1->data, d2->data, len);

}



static inline void nft_data_copy(struct nft_data *dst,

				 const struct nft_data *src)

{

net/netfilter/nft_cmp.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void nft_cmp_eval(const struct nft_expr *expr, 
	const struct nft_cmp_expr *priv = nft_expr_priv(expr);

	int d;



	d = nft_data_cmp(&regs->data[priv->sreg], &priv->data, priv->len);

	d = memcmp(&regs->data[priv->sreg], &priv->data, priv->len);

	switch (priv->op) {

	case NFT_CMP_EQ:

		if (d != 0)

net/netfilter/nft_hash.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static inline int nft_hash_cmp(struct rhashtable_compare_arg *arg, 
	const struct nft_hash_cmp_arg *x = arg->key;

	const struct nft_hash_elem *he = ptr;



	if (nft_data_cmp(nft_set_ext_key(&he->ext), x->key, x->set->klen))

	if (memcmp(nft_set_ext_key(&he->ext), x->key, x->set->klen))

		return 1;

	if (nft_set_elem_expired(&he->ext))

		return 1;

net/netfilter/nft_rbtree.c

+5 −6
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static bool nft_rbtree_lookup(const struct nft_set *set, 
	while (parent != NULL) {

		rbe = rb_entry(parent, struct nft_rbtree_elem, node);



		d = nft_data_cmp(nft_set_ext_key(&rbe->ext), key, set->klen);

		d = memcmp(nft_set_ext_key(&rbe->ext), key, set->klen);

		if (d < 0) {

			parent = parent->rb_left;

			interval = rbe;
@@ -91,7 +91,7 @@ static int __nft_rbtree_insert(const struct nft_set *set, 
	while (*p != NULL) {

		parent = *p;

		rbe = rb_entry(parent, struct nft_rbtree_elem, node);

		d = nft_data_cmp(nft_set_ext_key(&rbe->ext),

		d = memcmp(nft_set_ext_key(&rbe->ext),

			   nft_set_ext_key(&new->ext),

			   set->klen);

		if (d < 0)
@@ -153,8 +153,7 @@ static void *nft_rbtree_deactivate(const struct nft_set *set, 
	while (parent != NULL) {

		rbe = rb_entry(parent, struct nft_rbtree_elem, node);



		d = nft_data_cmp(nft_set_ext_key(&rbe->ext), &elem->key,

				 set->klen);

		d = memcmp(nft_set_ext_key(&rbe->ext), &elem->key, set->klen);

		if (d < 0)

			parent = parent->rb_left;

		else if (d > 0)