Linux Kernel Selftest development
 help / color / mirror / Atom feed
From: Jason Xing <kerneljasonxing@gmail.com>
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
	pabeni@redhat.com, dsahern@kernel.org,
	willemdebruijn.kernel@gmail.com, shuah@kernel.org,
	willemb@google.com
Cc: linux-kselftest@vger.kernel.org, netdev@vger.kernel.org,
	Jason Xing <kernelxing@tencent.com>
Subject: [PATCH net-next 1/3] net-timestamp: add strict check when setting tx flags
Date: Mon, 30 Sep 2024 17:24:14 +0800	[thread overview]
Message-ID: <20240930092416.80830-2-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20240930092416.80830-1-kerneljasonxing@gmail.com>

From: Jason Xing <kernelxing@tencent.com>

Even though this case is unlikely to happen, we have to avoid such
a case occurring at an earlier point: the sk_rmem_alloc could get
increased because of inserting more and more skbs into the errqueue
when calling __skb_complete_tx_timestamp(). This bad case would stop
the socket transmitting soon.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
---
 net/core/sock.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/core/sock.c b/net/core/sock.c
index fe87f9bd8f16..4bddd6f62e4f 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -905,6 +905,10 @@ int sock_set_timestamping(struct sock *sk, int optname,
 	if (val & ~SOF_TIMESTAMPING_MASK)
 		return -EINVAL;
 
+	if (val & SOF_TIMESTAMPING_TX_RECORD_MASK &&
+	    !(val & SOF_TIMESTAMPING_SOFTWARE))
+		return -EINVAL;
+
 	if (val & SOF_TIMESTAMPING_OPT_ID_TCP &&
 	    !(val & SOF_TIMESTAMPING_OPT_ID))
 		return -EINVAL;
-- 
2.37.3


  reply	other threads:[~2024-09-30  9:24 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-30  9:24 [PATCH net-next 0/3] net-timestamp: add some trivial Jason Xing
2024-09-30  9:24 ` Jason Xing [this message]
2024-09-30 10:39   ` [PATCH net-next 1/3] net-timestamp: add strict check when setting tx flags Willem de Bruijn
2024-09-30 11:29     ` Jason Xing
2024-09-30 11:49       ` Willem de Bruijn
2024-09-30 12:42         ` Jason Xing
2024-09-30 17:14           ` Willem de Bruijn
2024-09-30 17:56             ` Jason Xing
2024-09-30 18:15               ` Willem de Bruijn
2024-10-01  0:42                 ` Jason Xing
2024-09-30 10:48   ` Vadim Fedorenko
2024-09-30 11:24     ` Jason Xing
2024-09-30  9:24 ` [PATCH net-next 2/3] net-timestamp: add OPT_ID_TCP test in selftests Jason Xing
2024-09-30 10:42   ` Willem de Bruijn
2024-09-30 11:49     ` Jason Xing
2024-09-30 11:54       ` Willem de Bruijn
2024-09-30 12:17         ` Jason Xing
2024-09-30  9:24 ` [PATCH net-next 3/3] net-timestamp: namespacify the sysctl_tstamp_allow_data Jason Xing
2024-09-30 10:47   ` Willem de Bruijn
2024-09-30 11:14     ` Jason Xing

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=20240930092416.80830-2-kerneljasonxing@gmail.com \
    --to=kerneljasonxing@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=kernelxing@tencent.com \
    --cc=kuba@kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shuah@kernel.org \
    --cc=willemb@google.com \
    --cc=willemdebruijn.kernel@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