linux-kernel - [PATCH] net: Fix called net_enable_timestamp() in sctp_copy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20210705123405.6089-1-yajun.deng@linux.dev>
Date:   Mon,  5 Jul 2021 20:34:05 +0800
From:   Yajun Deng <yajun.deng@...ux.dev>
To:     davem@...emloft.net, kuba@...nel.org, vyasevich@...il.com,
        nhorman@...driver.com, marcelo.leitner@...il.com,
        pabeni@...hat.com, mathew.j.martineau@...ux.intel.com,
        edumazet@...gle.com, aahringo@...hat.com, linmiaohe@...wei.com,
        fw@...len.de, xiangxia.m.yue@...il.com, keescook@...omium.org
Cc:     linux-kernel@...r.kernel.org, linux-sctp@...r.kernel.org,
        Yajun Deng <yajun.deng@...ux.dev>
Subject: [PATCH] net: Fix called net_enable_timestamp() in sctp_copy_sock()

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

Signed-off-by: Yajun Deng <yajun.deng@...ux.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