Commit 01ccdf12 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

neigh: make strucrt neigh_table::entry_size unsigned int 



Key length can't be negative.

Leave comparisons against nla_len() signed just in case truncated attribute
can sneak in there.

Space savings:

	add/remove: 0/0 grow/shrink: 0/7 up/down: 0/-7 (-7)
	function                                     old     new   delta
	pneigh_delete                                273     272      -1
	mlx5e_rep_netevent_event                    1415    1414      -1
	mlx5e_create_encap_header_ipv6              1194    1193      -1
	mlx5e_create_encap_header_ipv4              1071    1070      -1
	cxgb4_l2t_get                               1104    1103      -1
	__pneigh_lookup                               69      68      -1
	__neigh_create                              2452    2451      -1

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e451ae8e

drivers/net/ethernet/chelsio/cxgb4/l2t.c

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ struct l2t_entry *cxgb4_l2t_get(struct l2t_data *d, struct neighbour *neigh, 
	u8 lport;

	u16 vlan;

	struct l2t_entry *e;

	int addr_len = neigh->tbl->key_len;

	unsigned int addr_len = neigh->tbl->key_len;

	u32 *addr = (u32 *)neigh->primary_key;

	int ifidx = neigh->dev->ifindex;

	int hash = addr_hash(d, addr, addr_len, ifidx);
@@ -536,7 +536,7 @@ void t4_l2t_update(struct adapter *adap, struct neighbour *neigh) 
	struct l2t_entry *e;

	struct sk_buff_head *arpq = NULL;

	struct l2t_data *d = adap->l2t;

	int addr_len = neigh->tbl->key_len;

	unsigned int addr_len = neigh->tbl->key_len;

	u32 *addr = (u32 *) neigh->primary_key;

	int ifidx = neigh->dev->ifindex;

	int hash = addr_hash(d, addr, addr_len, ifidx);

include/net/neighbour.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct neigh_hash_table { 
struct neigh_table {

	int			family;

	unsigned int		entry_size;

	int			key_len;

	unsigned int		key_len;

	__be16			protocol;

	__u32			(*hash)(const void *pkey,

					const struct net_device *dev,

net/core/neighbour.c

+9 −9
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net, 
				     const void *pkey)

{

	struct neighbour *n;

	int key_len = tbl->key_len;

	unsigned int key_len = tbl->key_len;

	u32 hash_val;

	struct neigh_hash_table *nht;
@@ -488,7 +488,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey, 
				 struct net_device *dev, bool want_ref)

{

	u32 hash_val;

	int key_len = tbl->key_len;

	unsigned int key_len = tbl->key_len;

	int error;

	struct neighbour *n1, *rc, *n = neigh_alloc(tbl, dev);

	struct neigh_hash_table *nht;
@@ -572,7 +572,7 @@ out_neigh_release: 
}

EXPORT_SYMBOL(__neigh_create);



static u32 pneigh_hash(const void *pkey, int key_len)

static u32 pneigh_hash(const void *pkey, unsigned int key_len)

{

	u32 hash_val = *(u32 *)(pkey + key_len - 4);

	hash_val ^= (hash_val >> 16);
@@ -585,7 +585,7 @@ static u32 pneigh_hash(const void *pkey, int key_len) 
static struct pneigh_entry *__pneigh_lookup_1(struct pneigh_entry *n,

					      struct net *net,

					      const void *pkey,

					      int key_len,

					      unsigned int key_len,

					      struct net_device *dev)

{

	while (n) {
@@ -601,7 +601,7 @@ static struct pneigh_entry *__pneigh_lookup_1(struct pneigh_entry *n, 
struct pneigh_entry *__pneigh_lookup(struct neigh_table *tbl,

		struct net *net, const void *pkey, struct net_device *dev)

{

	int key_len = tbl->key_len;

	unsigned int key_len = tbl->key_len;

	u32 hash_val = pneigh_hash(pkey, key_len);



	return __pneigh_lookup_1(tbl->phash_buckets[hash_val],
@@ -614,7 +614,7 @@ struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl, 
				    struct net_device *dev, int creat)

{

	struct pneigh_entry *n;

	int key_len = tbl->key_len;

	unsigned int key_len = tbl->key_len;

	u32 hash_val = pneigh_hash(pkey, key_len);



	read_lock_bh(&tbl->lock);
@@ -659,7 +659,7 @@ int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *pkey, 
		  struct net_device *dev)

{

	struct pneigh_entry *n, **np;

	int key_len = tbl->key_len;

	unsigned int key_len = tbl->key_len;

	u32 hash_val = pneigh_hash(pkey, key_len);



	write_lock_bh(&tbl->lock);
@@ -1662,7 +1662,7 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (tbl == NULL)

		return -EAFNOSUPPORT;



	if (nla_len(dst_attr) < tbl->key_len)

	if (nla_len(dst_attr) < (int)tbl->key_len)

		goto out;



	if (ndm->ndm_flags & NTF_PROXY) {
@@ -1730,7 +1730,7 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (tbl == NULL)

		return -EAFNOSUPPORT;



	if (nla_len(tb[NDA_DST]) < tbl->key_len)

	if (nla_len(tb[NDA_DST]) < (int)tbl->key_len)

		goto out;

	dst = nla_data(tb[NDA_DST]);

	lladdr = tb[NDA_LLADDR] ? nla_data(tb[NDA_LLADDR]) : NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE