public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yajun Deng <yajun.deng@linux.dev>
To: davem@davemloft.net, kuba@kernel.org, vyasevich@gmail.com,
	nhorman@tuxdriver.com, marcelo.leitner@gmail.com,
	pabeni@redhat.com, mathew.j.martineau@linux.intel.com,
	edumazet@google.com, aahringo@redhat.com, linmiaohe@huawei.com,
	fw@strlen.de, xiangxia.m.yue@gmail.com, keescook@chromium.org
Cc: linux-kernel@vger.kernel.org, linux-sctp@vger.kernel.org,
	Yajun Deng <yajun.deng@linux.dev>
Subject: [PATCH] net: Fix called net_enable_timestamp() in sctp_copy_sock()
Date: Mon,  5 Jul 2021 20:34:05 +0800	[thread overview]
Message-ID: <20210705123405.6089-1-yajun.deng@linux.dev> (raw)

Add sock_needs_netstamp() judgment condition when need to call
net_enable_timestamp().

Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
---
 include/net/sock.h | 1 +
 net/core/sock.c    | 2 +-
 net/sctp/socket.c  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 8bdd80027ffb..e36563576758 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2757,6 +2757,7 @@ int sock_bindtoindex(struct sock *sk, int ifindex, bool lock_sk);
 void sock_set_timestamp(struct sock *sk, int optname, bool valbool);
 int sock_set_timestamping(struct sock *sk, int optname, int val);
 
+bool sock_needs_netstamp(const struct sock *sk);
 void sock_enable_timestamps(struct sock *sk);
 void sock_no_linger(struct sock *sk);
 void sock_set_keepalive(struct sock *sk);
diff --git a/net/core/sock.c b/net/core/sock.c
index ba1c0f75cd45..ce6ec9f8ac7c 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -429,7 +429,7 @@ static int sock_set_timeout(long *timeo_p, sockptr_t optval, int optlen,
 	return 0;
 }
 
-static bool sock_needs_netstamp(const struct sock *sk)
+bool sock_needs_netstamp(const struct sock *sk)
 {
 	switch (sk->sk_family) {
 	case AF_UNSPEC:
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index e64e01f61b11..30d90735beb0 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -9449,7 +9449,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
 	newinet->mc_index = 0;
 	newinet->mc_list = NULL;
 
-	if (newsk->sk_flags & SK_FLAGS_TIMESTAMP)
+	if (sock_needs_netstamp(newsk) && newsk->sk_flags & SK_FLAGS_TIMESTAMP)
 		net_enable_timestamp();
 
 	/* Set newsk security attributes from original sk and connection
-- 
2.32.0


             reply	other threads:[~2021-07-05 12:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-05 12:34 Yajun Deng [this message]
2021-07-06  1:12 ` [PATCH] net: Fix called net_enable_timestamp() in sctp_copy_sock() Xin Long

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=20210705123405.6089-1-yajun.deng@linux.dev \
    --to=yajun.deng@linux.dev \
    --cc=aahringo@redhat.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=fw@strlen.de \
    --cc=keescook@chromium.org \
    --cc=kuba@kernel.org \
    --cc=linmiaohe@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sctp@vger.kernel.org \
    --cc=marcelo.leitner@gmail.com \
    --cc=mathew.j.martineau@linux.intel.com \
    --cc=nhorman@tuxdriver.com \
    --cc=pabeni@redhat.com \
    --cc=vyasevich@gmail.com \
    --cc=xiangxia.m.yue@gmail.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