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

Commit 9cb5734e authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[TCP]: Convert several length variable to unsigned. 



Several length variables cannot be negative, so convert int to
unsigned int.  This also allows us to do sane shift operations
on those variables.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c40896de

include/net/tcp.h

+4 −2
Original line number Diff line number Diff line
@@ -1155,7 +1155,8 @@ extern int tcp_v4_calc_md5_hash(char *md5_hash, 
						     struct dst_entry *dst,

						     struct request_sock *req,

						     struct tcphdr *th,

						     int protocol, int tcplen);

						     int protocol,

						     unsigned int tcplen);

extern struct tcp_md5sig_key	*tcp_v4_md5_lookup(struct sock *sk,

						   struct sock *addr_sk);
@@ -1404,7 +1405,8 @@ struct tcp_sock_af_ops { 
						  struct dst_entry *dst,

						  struct request_sock *req,

						  struct tcphdr *th,

						  int protocol, int len);

						  int protocol,

						  unsigned int len);

	int			(*md5_add) (struct sock *sk,

					    struct sock *addr_sk,

					    u8 *newkey,

net/ipv4/tcp_ipv4.c

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, 
static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,

				   __be32 saddr, __be32 daddr,

				   struct tcphdr *th, int protocol,

				   int tcplen);

				   unsigned int tcplen);

#endif



struct inet_hashinfo __cacheline_aligned tcp_hashinfo = {
@@ -1020,7 +1020,7 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval, 
static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,

				   __be32 saddr, __be32 daddr,

				   struct tcphdr *th, int protocol,

				   int tcplen)

				   unsigned int tcplen)

{

	struct scatterlist sg[4];

	__u16 data_len;
@@ -1113,7 +1113,7 @@ int tcp_v4_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key, 
			 struct dst_entry *dst,

			 struct request_sock *req,

			 struct tcphdr *th, int protocol,

			 int tcplen)

			 unsigned int tcplen)

{

	__be32 saddr, daddr;

net/ipv6/tcp_ipv6.c

+4 −4
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key, 
				   struct in6_addr *saddr,

				   struct in6_addr *daddr,

				   struct tcphdr *th, int protocol,

				   int tcplen)

				   unsigned int tcplen)

{

	struct scatterlist sg[4];

	__u16 data_len;
@@ -818,7 +818,7 @@ static int tcp_v6_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key, 
				struct dst_entry *dst,

				struct request_sock *req,

				struct tcphdr *th, int protocol,

				int tcplen)

				unsigned int tcplen)

{

	struct in6_addr *saddr, *daddr;
@@ -985,7 +985,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) 
	struct tcphdr *th = tcp_hdr(skb), *t1;

	struct sk_buff *buff;

	struct flowi fl;

	int tot_len = sizeof(*th);

	unsigned int tot_len = sizeof(*th);

#ifdef CONFIG_TCP_MD5SIG

	struct tcp_md5sig_key *key;

#endif
@@ -1085,7 +1085,7 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw, 
	struct tcphdr *th = tcp_hdr(skb), *t1;

	struct sk_buff *buff;

	struct flowi fl;

	int tot_len = sizeof(struct tcphdr);

	unsigned int tot_len = sizeof(struct tcphdr);

	__be32 *topt;

#ifdef CONFIG_TCP_MD5SIG

	struct tcp_md5sig_key *key;