From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 366AC3D0918 for ; Fri, 8 May 2026 12:08:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778242137; cv=none; b=k7yATO2wdnb9UtQn113uLf9D4m8MjNECsCja5NrPmUBBLzTNVkUUCRH6Fqctvd6sYBsCjRrUEY9jUam4BeEDlEw+ArxPI5SoE6dNVXNhsKxR+c+JCB5bHDUIrw6Ioc5KEvIFemj4g958eSRHbLnbNAD5B3oVeJuoIgbH8E3qMAs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778242137; c=relaxed/simple; bh=S+AcWVmLoet6g9VZdUwzYxVEGVFSw/VjPbZZzfwKjvg=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=iqRicKRKVBkJlo+nzryJtyq7DXMzhKEFsYCjFM6AtT4zlyTJRTTysczwqpFY6wadnZ2LIDyD8cMkLqiPVvZLPq4xwbFEv/m9qsOAhRXnaJsGejv3oBEQfDf3AiNfaeLjO+SV2YBz3rJM1Diz2dOW+SLYLaQcSd7HXXTN535j80o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bfmWwOtd; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bfmWwOtd" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-365c5ca76fdso1600174a91.2 for ; Fri, 08 May 2026 05:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778242135; x=1778846935; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=o1XcD/NkGd3x78OcBs8IiVYHbP5jUQCOzADI2FH/BY4=; b=bfmWwOtd0K2vRNyX8z1TXiLWjzAxVmKzvlb1DoGXUgrkJRdrP2tBGU9ryRAmyd0FLF CqSbp9lK+OvFiFDKRD1c11Kq2L0xtXtlA+sepyV5+WtrzxAfYtcuvs//WuqeU6AaIiwH vvPw4YfeslRV1f7e7td8wneHrCYe0URN3a15wDC+AzeUdEhA+0JL11nSloHLN/gP9tsi kLaDXaJNa0ka/DdFur7Dfq1a3xtq5nD5jSOzYd5FFUHbLuQ/J902SjwA549gPPTeU6Ym Mb4e9N0tYNd2XX13nboVxALgorpMv4UNgJDupmVr51otOmo/g3X9qv8I8E1SXN5t5cnw Wzvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778242135; x=1778846935; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=o1XcD/NkGd3x78OcBs8IiVYHbP5jUQCOzADI2FH/BY4=; b=P6niL+V5WPa0F0utqasAYhNJhdJQ976YW7tkkG3LfHyWEcduZW7R9R5IvvZQf+Qd+V DrZlEqZDgb8PjYe2hv+6oWU7S1+bwNwkhvBW0oYfAOfRensE2rzIoESlCmFHYBQdoUGk HH5Ixa/NUNGFaqipxSPW9toDbL1VMuDQfq/AXWQPOV13Zh9wYaP9EBI0hln+BgSm7GOR jBC+X2bgg9AQOw+DcwkrndftlVrTQI/731PbGCKJdccz+OMmQR3+nBmDktj5+RdFmZoD sNpgdaAnjiX3rFDxR++c+GC6FvpeL8QXp9ZU4bqT0kBjOFM5rHCauRRMhw3DVkA5zKGL lJUA== X-Forwarded-Encrypted: i=1; AFNElJ/YWrYUReg4T9zhxiVFWRwYgvWnFuG2zHRX06Ap1K7lSCRKr+9A7lVkSzgk1X1h1BnPMJ8NCiI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8IkHpG+oEnL2pSi3i7S+upvNlpOd1mKUt32O4bkOnLwjiIEQb 4iQfL7Ej6AYfygTBver7c5OggMsQwCZ1tvxprRpVMZtW08zSO5Rn26ebEgOrNLYe5XlS3GuPyT9 agqSwbg== X-Received: from pjqt4.prod.google.com ([2002:a17:90a:ae04:b0:35f:ba7a:947d]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2f4e:b0:35f:c46f:2b0 with SMTP id 98e67ed59e1d1-365ac080c4bmr11271691a91.14.1778242135316; Fri, 08 May 2026 05:08:55 -0700 (PDT) Date: Fri, 8 May 2026 12:08:46 +0000 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260508120853.4098365-1-kuniyu@google.com> Subject: [PATCH v2 net] tcp: Fix out-of-bounds access for twsk in tcp_ao_established_key(). From: Kuniyuki Iwashima To: Eric Dumazet , Neal Cardwell , "David S. Miller" , Jakub Kicinski , Paolo Abeni Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Simon Horman , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, Damiano Melotti Content-Type: text/plain; charset="UTF-8" lockdep_sock_is_held() was added in tcp_ao_established_key() by the cited commit. It can be called from tcp_v[46]_timewait_ack() with twsk. Since it does not have sk->sk_lock, the lockdep annotation results in out-of-bound access. $ pahole -C tcp_timewait_sock vmlinux | grep size /* size: 288, cachelines: 5, members: 8 */ $ pahole -C sock vmlinux | grep sk_lock socket_lock_t sk_lock; /* 440 192 */ Let's not use lockdep_sock_is_held() for TCP_TIME_WAIT. Fixes: 6b2d11e2d8fc ("net/tcp: Add missing lockdep annotations for TCP-AO hlist traversals") Reported-by: Damiano Melotti Signed-off-by: Kuniyuki Iwashima --- v2: Ensure that TCP_TIME_WAIT does not evade RCU lockdep check v1: https://lore.kernel.org/netdev/20260506172830.2237574-1-kuniyu@google.com/ --- net/ipv4/tcp_ao.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c index a97cdf3e6af4..0a4b38b315fe 100644 --- a/net/ipv4/tcp_ao.c +++ b/net/ipv4/tcp_ao.c @@ -116,7 +116,8 @@ struct tcp_ao_key *tcp_ao_established_key(const struct sock *sk, { struct tcp_ao_key *key; - hlist_for_each_entry_rcu(key, &ao->head, node, lockdep_sock_is_held(sk)) { + hlist_for_each_entry_rcu(key, &ao->head, node, + sk_fullsock(sk) && lockdep_sock_is_held(sk)) { if ((sndid >= 0 && key->sndid != sndid) || (rcvid >= 0 && key->rcvid != rcvid)) continue; -- 2.54.0.563.g4f69b47b94-goog