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

Commit 8d32503e authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: fix some type cast warnings introduced by transport rhashtable 



These warnings were found by running 'make C=2 M=net/sctp/'.

They are introduced by not aware of Endian for the port when
coding transport rhashtable patches.

Fixes: 7fda702f ("sctp: use new rhlist interface on sctp transport rhashtable")
Reported-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1da4fc97

net/sctp/input.c

+11 −11
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(struct net *net, 
struct sctp_hash_cmp_arg {

	const union sctp_addr	*paddr;

	const struct net	*net;

	u16			lport;

	__be16			lport;

};



static inline int sctp_hash_cmp(struct rhashtable_compare_arg *arg,
@@ -820,37 +820,37 @@ static inline int sctp_hash_cmp(struct rhashtable_compare_arg *arg, 
	return err;

}



static inline u32 sctp_hash_obj(const void *data, u32 len, u32 seed)

static inline __u32 sctp_hash_obj(const void *data, u32 len, u32 seed)

{

	const struct sctp_transport *t = data;

	const union sctp_addr *paddr = &t->ipaddr;

	const struct net *net = sock_net(t->asoc->base.sk);

	u16 lport = htons(t->asoc->base.bind_addr.port);

	u32 addr;

	__be16 lport = htons(t->asoc->base.bind_addr.port);

	__u32 addr;



	if (paddr->sa.sa_family == AF_INET6)

		addr = jhash(&paddr->v6.sin6_addr, 16, seed);

	else

		addr = paddr->v4.sin_addr.s_addr;

		addr = (__force __u32)paddr->v4.sin_addr.s_addr;



	return  jhash_3words(addr, ((__u32)paddr->v4.sin_port) << 16 |

	return  jhash_3words(addr, ((__force __u32)paddr->v4.sin_port) << 16 |

			     (__force __u32)lport, net_hash_mix(net), seed);

}



static inline u32 sctp_hash_key(const void *data, u32 len, u32 seed)

static inline __u32 sctp_hash_key(const void *data, u32 len, u32 seed)

{

	const struct sctp_hash_cmp_arg *x = data;

	const union sctp_addr *paddr = x->paddr;

	const struct net *net = x->net;

	u16 lport = x->lport;

	u32 addr;

	__be16 lport = x->lport;

	__u32 addr;



	if (paddr->sa.sa_family == AF_INET6)

		addr = jhash(&paddr->v6.sin6_addr, 16, seed);

	else

		addr = paddr->v4.sin_addr.s_addr;

		addr = (__force __u32)paddr->v4.sin_addr.s_addr;



	return  jhash_3words(addr, ((__u32)paddr->v4.sin_port) << 16 |

	return  jhash_3words(addr, ((__force __u32)paddr->v4.sin_port) << 16 |

			     (__force __u32)lport, net_hash_mix(net), seed);

}