github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: ensure SCM_TXTIME delivery time is no older than system boot

Browse Source 
Limit input to sane values to avoid having to add tests later in the
kernel hot path, e.g., in FQ.

SCM_TXTIME timestamps are converted to signed ktime_t when assigned to
skb->tstamp. Avoid having negative values overflow into large positive
ones when again used as u64, e.g., in FQ time_to_send.

For CLOCK_MONOTONIC, only allow positive values.

For CLOCK_REALTIME and CLOCK_TAI, allow equivalent values, i.e., no
older than the boot of the machine.

skb->tstamp zero is a special case signaling feature off. This is not
converted between clockids.

Handle the special case where the realtime clock is set so small that
real - mono is negative, however unlikely in practice.

Ideally we would also set a sane upper bound, but that would require
reading the clock, which is an expensive operation. Continue to defer
that validation to users of the data. FQ already does this.

Bound rather than return error on older timestamps. This is the
existing policy e.g., in FQ.

Signed-off-by: Willem de Bruijn <willemb@google.com>

----

Changes
  v1 -> v2
    - remove spurious semicolon at end of switch
    - remove Fixes tag

Link: https://patch.msgid.link/20260604194221.3319080-2-willemdebruijn.kernel@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Willem de Bruijn 2026-06-04 15:41:03 -04:00 committed by Jakub Kicinski
parent 1bf20cc62a
commit 73f1a618b0
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
net/core/sock.c
View File

@ -3045,12 +3045,42 @@ int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
sockc->tsflags |= tsflags;
break;
case SCM_TXTIME:
{
ktime_t tmin;
u64 txtime;
if (!sock_flag(sk, SOCK_TXTIME))
return -EINVAL;
if (cmsg->cmsg_len != CMSG_LEN(sizeof(u64)))
return -EINVAL;
sockc->transmit_time = get_unaligned((u64 *)CMSG_DATA(cmsg));
txtime = get_unaligned((u64 *)CMSG_DATA(cmsg));
/* Allow sending without a delivery time: zero special case */
if (!txtime) {
sockc->transmit_time = 0;
break;
}
switch (sk->sk_clockid) {
case CLOCK_MONOTONIC:
tmin = 1;
break;
case CLOCK_REALTIME:
tmin = max(ktime_mono_to_real(0), 1);
break;
case CLOCK_TAI:
tmin = max(ktime_mono_to_any(0, TK_OFFS_TAI), 1);
break;
default:
tmin = 1;
WARN_ON_ONCE(1);
break;
}
sockc->transmit_time = max_t(ktime_t, txtime, tmin);
break;
}
case SCM_TS_OPT_ID:
if (sk_is_tcp(sk))
return -EINVAL;