netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, sasha.levin@oracle.com,
	daniel@iogearbox.net, alexei.starovoitov@gmail.com,
	mkubecek@suse.cz
Subject: [PATCH net 6/4] tcp: fix __sk_dst_get usage in tcp_current_mss
Date: Fri,  1 Apr 2016 01:56:07 +0200	[thread overview]
Message-ID: <1459468567-3927-1-git-send-email-hannes@stressinduktion.org> (raw)
In-Reply-To: <1459466982-20432-1-git-send-email-hannes@stressinduktion.org>

Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
---
 net/ipv4/tcp_output.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index ba3621834e7bfa..3f70582578ada0 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1426,21 +1426,21 @@ EXPORT_SYMBOL(tcp_sync_mss);
 unsigned int tcp_current_mss(struct sock *sk)
 {
 	const struct tcp_sock *tp = tcp_sk(sk);
-	const struct dst_entry *dst = __sk_dst_get(sk);
+	const struct dst_entry *dst;
 	u32 mss_now;
 	unsigned int header_len;
 	struct tcp_out_options opts;
 	struct tcp_md5sig_key *md5;
 
+	rcu_read_lock();
 	mss_now = tp->mss_cache;
-
+	dst = __sk_dst_get(sk);
 	if (dst) {
 		u32 mtu = dst_mtu(dst);
 		if (mtu != inet_csk(sk)->icsk_pmtu_cookie)
 			mss_now = tcp_sync_mss(sk, mtu);
 	}
 
-	rcu_read_lock();
 	header_len = tcp_established_options(sk, NULL, &opts, &md5) +
 		     sizeof(struct tcphdr);
 	rcu_read_unlock();
-- 
2.5.5

      parent reply	other threads:[~2016-03-31 23:56 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-31 23:29 [PATCH net 0/4] net: fix and tighten rcu dereference checks Hannes Frederic Sowa
2016-03-31 23:29 ` [PATCH net 1/4] tun: add socket locking around sk_{attach,detach}_filter Hannes Frederic Sowa
2016-03-31 23:29 ` [PATCH net 2/4] net: proper check if we hold the socket lock during dereference Hannes Frederic Sowa
2016-03-31 23:29 ` [PATCH net 3/4] sock: use lockdep_sock_is_held were appropriate Hannes Frederic Sowa
2016-03-31 23:29 ` [PATCH net 4/4] tcp: various missing rcu_read_lock around __sk_dst_get Hannes Frederic Sowa
2016-03-31 23:39   ` Eric Dumazet
2016-04-01  0:01     ` Hannes Frederic Sowa
2016-04-01  0:12       ` Eric Dumazet
2016-04-01  0:21         ` Hannes Frederic Sowa
2016-04-01  1:19           ` Eric Dumazet
2016-04-01  1:36             ` Hannes Frederic Sowa
2016-04-01  1:39               ` Eric Dumazet
2016-04-01  1:45                 ` Eric Dumazet
2016-04-01  2:01                   ` Hannes Frederic Sowa
2016-04-01  3:13                     ` Eric Dumazet
2016-04-01  3:31                       ` Hannes Frederic Sowa
2016-04-01  1:58                 ` Hannes Frederic Sowa
2016-04-01  1:45             ` Alexei Starovoitov
2016-04-01  3:03               ` Eric Dumazet
2016-04-01  3:06                 ` Hannes Frederic Sowa
2016-04-01  4:04                 ` Alexei Starovoitov
2016-04-01  4:12                   ` Hannes Frederic Sowa
2016-04-01  4:26                     ` Alexei Starovoitov
2016-04-01  4:33                       ` Hannes Frederic Sowa
2016-04-01  8:10                         ` Daniel Borkmann
2016-04-01 18:33                           ` David Miller
2016-04-01 18:36                             ` Daniel Borkmann
2016-04-01  0:30         ` Hannes Frederic Sowa
2016-04-01  1:23           ` Eric Dumazet
2016-04-01  1:37             ` Hannes Frederic Sowa
2016-03-31 23:48 ` [PATCH net 5/4] tcp: fix rcu usage around __sk_dst_get in tcp_update_metrics Hannes Frederic Sowa
2016-03-31 23:56 ` Hannes Frederic Sowa [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459468567-3927-1-git-send-email-hannes@stressinduktion.org \
    --to=hannes@stressinduktion.org \
    --cc=alexei.starovoitov@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=mkubecek@suse.cz \
    --cc=netdev@vger.kernel.org \
    --cc=sasha.levin@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).