Commit 534322ca authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

ipv4/tcp: Pass dif and sdif to tcp_v4_inbound_md5_hash 



The original ingress device index is saved to the cb space of the skb
and the cb is moved during tcp processing. Since tcp_v4_inbound_md5_hash
can be called before and after the cb move, pass dif and sdif to it so
the caller can save both prior to the cb move. Both are used by a later
patch.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d14c77e0

net/ipv4/tcp_ipv4.c

+8 −5
Original line number Diff line number Diff line
@@ -707,6 +707,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) 
		key = tcp_md5_do_lookup(sk, addr, AF_INET);

	} else if (hash_location) {

		const union tcp_md5_addr *addr;

		int sdif = tcp_v4_sdif(skb);

		int dif = inet_iif(skb);



		/*

		 * active side is lost. Try to find listening socket through
@@ -718,8 +720,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) 
		sk1 = __inet_lookup_listener(net, &tcp_hashinfo, NULL, 0,

					     ip_hdr(skb)->saddr,

					     th->source, ip_hdr(skb)->daddr,

					     ntohs(th->source), inet_iif(skb),

					     tcp_v4_sdif(skb));

					     ntohs(th->source), dif, sdif);

		/* don't send rst if it can't find key */

		if (!sk1)

			goto out;
@@ -1293,7 +1294,8 @@ EXPORT_SYMBOL(tcp_v4_md5_hash_skb); 


/* Called with rcu_read_lock() */

static bool tcp_v4_inbound_md5_hash(const struct sock *sk,

				    const struct sk_buff *skb)

				    const struct sk_buff *skb,

				    int dif, int sdif)

{

#ifdef CONFIG_TCP_MD5SIG

	/*
@@ -1817,6 +1819,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
	struct net *net = dev_net(skb->dev);

	struct sk_buff *skb_to_free;

	int sdif = inet_sdif(skb);

	int dif = inet_iif(skb);

	const struct iphdr *iph;

	const struct tcphdr *th;

	bool refcounted;
@@ -1865,7 +1868,7 @@ process: 
		struct sock *nsk;



		sk = req->rsk_listener;

		if (unlikely(tcp_v4_inbound_md5_hash(sk, skb))) {

		if (unlikely(tcp_v4_inbound_md5_hash(sk, skb, dif, sdif))) {

			sk_drops_add(sk, skb);

			reqsk_put(req);

			goto discard_it;
@@ -1923,7 +1926,7 @@ process: 
	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))

		goto discard_and_relse;



	if (tcp_v4_inbound_md5_hash(sk, skb))

	if (tcp_v4_inbound_md5_hash(sk, skb, dif, sdif))

		goto discard_and_relse;



	nf_reset_ct(skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE