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

Commit 318cf7aa authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: md5: add more const attributes 



Now tcp_md5_hash_header() has a const tcphdr argument, we can add more
const attributes to callers.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f9f4668

include/net/tcp.h

+9 −8
Original line number Diff line number Diff line
@@ -1185,8 +1185,9 @@ struct tcp_md5sig_pool { 


/* - functions */

extern int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,

			       struct sock *sk, struct request_sock *req,

			       struct sk_buff *skb);

			       const struct sock *sk,

			       const struct request_sock *req,

			       const struct sk_buff *skb);

extern struct tcp_md5sig_key * tcp_v4_md5_lookup(struct sock *sk,

						 struct sock *addr_sk);

extern int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, u8 *newkey,
@@ -1448,9 +1449,9 @@ struct tcp_sock_af_ops { 
						struct sock *addr_sk);

	int			(*calc_md5_hash) (char *location,

						  struct tcp_md5sig_key *md5,

						  struct sock *sk,

						  struct request_sock *req,

						  struct sk_buff *skb);

						  const struct sock *sk,

						  const struct request_sock *req,

						  const struct sk_buff *skb);

	int			(*md5_add) (struct sock *sk,

					    struct sock *addr_sk,

					    u8 *newkey,
@@ -1467,9 +1468,9 @@ struct tcp_request_sock_ops { 
						struct request_sock *req);

	int			(*calc_md5_hash) (char *location,

						  struct tcp_md5sig_key *md5,

						  struct sock *sk,

						  struct request_sock *req,

						  struct sk_buff *skb);

						  const struct sock *sk,

						  const struct request_sock *req,

						  const struct sk_buff *skb);

#endif

};

net/ipv4/tcp_ipv4.c

+6 −6
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ EXPORT_SYMBOL(sysctl_tcp_low_latency); 
static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,

						   __be32 addr);

static int tcp_v4_md5_hash_hdr(char *md5_hash, struct tcp_md5sig_key *key,

			       __be32 daddr, __be32 saddr, struct tcphdr *th);

			       __be32 daddr, __be32 saddr, const struct tcphdr *th);

#else

static inline

struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, __be32 addr)
@@ -1090,7 +1090,7 @@ static int tcp_v4_md5_hash_pseudoheader(struct tcp_md5sig_pool *hp, 
}



static int tcp_v4_md5_hash_hdr(char *md5_hash, struct tcp_md5sig_key *key,

			       __be32 daddr, __be32 saddr, struct tcphdr *th)

			       __be32 daddr, __be32 saddr, const struct tcphdr *th)

{

	struct tcp_md5sig_pool *hp;

	struct hash_desc *desc;
@@ -1122,12 +1122,12 @@ static int tcp_v4_md5_hash_hdr(char *md5_hash, struct tcp_md5sig_key *key, 
}



int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,

			struct sock *sk, struct request_sock *req,

			struct sk_buff *skb)

			const struct sock *sk, const struct request_sock *req,

			const struct sk_buff *skb)

{

	struct tcp_md5sig_pool *hp;

	struct hash_desc *desc;

	struct tcphdr *th = tcp_hdr(skb);

	const struct tcphdr *th = tcp_hdr(skb);

	__be32 saddr, daddr;



	if (sk) {
@@ -1172,7 +1172,7 @@ int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key, 
}

EXPORT_SYMBOL(tcp_v4_md5_hash_skb);



static int tcp_v4_inbound_md5_hash(struct sock *sk, struct sk_buff *skb)

static int tcp_v4_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb)

{

	/*

	 * This gets called for each TCP segment that arrives

net/ipv6/tcp_ipv6.c

+7 −6
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static int tcp_v6_md5_hash_pseudoheader(struct tcp_md5sig_pool *hp, 


static int tcp_v6_md5_hash_hdr(char *md5_hash, struct tcp_md5sig_key *key,

			       const struct in6_addr *daddr, struct in6_addr *saddr,

			       struct tcphdr *th)

			       const struct tcphdr *th)

{

	struct tcp_md5sig_pool *hp;

	struct hash_desc *desc;
@@ -793,13 +793,14 @@ static int tcp_v6_md5_hash_hdr(char *md5_hash, struct tcp_md5sig_key *key, 
}



static int tcp_v6_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,

			       struct sock *sk, struct request_sock *req,

			       struct sk_buff *skb)

			       const struct sock *sk,

			       const struct request_sock *req,

			       const struct sk_buff *skb)

{

	const struct in6_addr *saddr, *daddr;

	struct tcp_md5sig_pool *hp;

	struct hash_desc *desc;

	struct tcphdr *th = tcp_hdr(skb);

	const struct tcphdr *th = tcp_hdr(skb);



	if (sk) {

		saddr = &inet6_sk(sk)->saddr;
@@ -842,12 +843,12 @@ static int tcp_v6_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key, 
	return 1;

}



static int tcp_v6_inbound_md5_hash (struct sock *sk, struct sk_buff *skb)

static int tcp_v6_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb)

{

	const __u8 *hash_location = NULL;

	struct tcp_md5sig_key *hash_expected;

	const struct ipv6hdr *ip6h = ipv6_hdr(skb);

	struct tcphdr *th = tcp_hdr(skb);

	const struct tcphdr *th = tcp_hdr(skb);

	int genhash;

	u8 newhash[16];