From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 8663D3E1228 for ; Wed, 29 Jul 2026 20:29:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785357006; cv=none; b=W7Gw+HL/ARwwKe6bB2NGOLLo/+42weKU+qFPicBqbsLXSoxA/QguejXzt1jKZrxEIy6P/5SwMzCxHDSr0mzGmxS6FjoIRafIikd3BI6KIzdTj8W30pwUISpVFL+yI8SvVIh/AdkwodWy5bHQcABzEdaewz4whgAVeyWj8awxcuY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785357006; c=relaxed/simple; bh=NeG2E7o+v7PpBd8N9EmtNU+R1//qVqRyfbrPbCbFDEA=; h=Mime-Version:Content-Type:Date:Message-Id:From:To:Cc:Subject: References:In-Reply-To; b=t08vBZS5aDp5G7SnHa/tuSJKqDdPwsQH7djBPFLqZTMZOmttqoA3P6du8DdzVQlk1IKq2Dbqj/Nn4Bj/gwWhJH1fIw1F3s/vPTkxh2XsUbtFi0g9R65MTFSIWAJTrY+KOQFh/A3IxhbCYlV8cASh0QCuhtOlK9Gx6N1tueFlV5M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com; spf=pass smtp.mailfrom=etsalapatis.com; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b=IzXo+qLz; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b="IzXo+qLz" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-381b831d535so1597056a91.0 for ; Wed, 29 Jul 2026 13:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=etsalapatis-com.20251104.gappssmtp.com; s=20251104; t=1785356997; x=1785961797; darn=vger.kernel.org; h=in-reply-to:references:subject:cc:to:from:message-id:date :content-type:content-transfer-encoding:mime-version:from:to:cc :subject:date:message-id:reply-to:content-type; bh=DLPzQAEQsLT2O+fSZwXxQMjGKwKGH7hwJYQcxqODA3s=; b=IzXo+qLzNqvAm+HOPw5+jup2ycvI3OoNnugNPCUsXE3rhF1hO6ek4Hg4zaGNZm2XCi uICfc5TFZyTeCeSGcRCe2ZMsOJkLllsr9aouL42BFzuifEVRiipimqKR/GTzhCtHiQtw OELR5/crzimXGpp0EvK1RVLBiUtNuz22kcF84ei3zJgJeUfjuBqECPHyphYSDux3R7Om K8eubf3sOmU6UvdgRgDsE4SX/HUQ5EtyDVNtuk9xk5N+0iNyUSU+w70yJTkZm6ZB1+pc rs/aiPU7N+Mf/JHcGzI0tPyfT34o31or7ta5FYQGcP1kRd6uvujTS0yFClkS5yNx3yk0 hgZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785356997; x=1785961797; h=in-reply-to:references:subject:cc:to:from:message-id:date :content-type:content-transfer-encoding:mime-version:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=DLPzQAEQsLT2O+fSZwXxQMjGKwKGH7hwJYQcxqODA3s=; b=lOnp8E1A2Wawa8bWLbQsdR+kXr3RfoRDURU6kVGabaUgc8OQWfxCLIVvyiSktr/m9y 5RPphOBxkjnh+xTy+eWM2qB3l3zpI5YwdGXpjg+FNT3afpf91TikttgFBTOCmUilexGI EA42EDxyXY8iTcec8Hw3l3oOCvuMpmWBHcwcS3YDYSjfhcWcK/rSDlFTiOMBELbYF3/2 D0xR+qIJqtL4kh66iY8Q9orMpE6T97Z6r4T1IfpNGOFbUBKy8t2X6S/ESYk1p0FlIG9f gtBA6mxS3SC6yMy8pDAWCm+Q/4XdVYS3AGb1t2JSdWYCZYPFTUdiCI1mLnflfOKOBJlW VDLQ== X-Gm-Message-State: AOJu0Yy3KMzWdFMzAThJXNRbgaGPr6h6lChiLvIU1EjoS3ej2U7D2kyt NaPWp2pfKfppuPxyX7WNnH9bd5emLhMf9ybQ8ntLpX1xEcoYw9K4VyYcv1XLh07yHHM= X-Gm-Gg: AR+sD110/54vcOlfTDdCRtXeG37Q2iqnmVdtJs+D4swFIuF55LBVdKLbpdyjfCeQhh2 eGScwjwIih2Hy8EdhSfjW3THq33/fXVvMaSdDUuags6o87h1N2+hwTSg35pDkABBxqoml0vdaT7 bknZpIYRlaIpYIToF7uyUvqEt6l2ikg5laHsKQW33ygjDZNgKAe4wEpk54GMc7xz6k4dGoB43GO dcv4Oex23cBlNADwL3+ArgxzxPyFzvWAuwFj9vdPLbAp+AC0Nl/7Sv7roHRdiwO8sFmxc5AdTg4 aPwxGcygJtFfOm10oXXpQakFB+PZAwXp2yRPNclR8Kd/zOEhB9B0+U3u8QZPzwnS3BLUcrHzZFH dwrZapHuCw6y5CmlJFAnpVrW82KpQx65OSagxz2KgXi2aniv2J0Cl4nrFpq63JKSy/6UlGzOOcN J/LfcXeMrSgzxDotzuDUuNsAYK7xV9Zv7tF4fVuhgokSA/ X-Received: by 2002:a05:6a21:60c8:b0:3b4:8bc6:138 with SMTP id adf61e73a8af0-3c8acbcdd34mr9864636637.23.1785356997286; Wed, 29 Jul 2026 13:29:57 -0700 (PDT) Received: from localhost ([2620:10d:c090:600::1:d447]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13e7273cd9esm13104919c88.13.2026.07.29.13.29.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Jul 2026 13:29:56 -0700 (PDT) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 29 Jul 2026 16:29:53 -0400 Message-Id: From: "Emil Tsalapatis" To: "Michal Luczaj" , "Eric Dumazet" , "Kuniyuki Iwashima" , "Paolo Abeni" , "Willem de Bruijn" , "John Fastabend" , "Jakub Sitnicki" , "Jiayuan Chen" , "David S. Miller" , "Jakub Kicinski" , "Simon Horman" , "Daniel Borkmann" , "Stanislav Fomichev" , "Martin KaFai Lau" , "Alexei Starovoitov" , "Andrii Nakryiko" , "Eduard Zingerman" , "Kumar Kartikeya Dwivedi" , "Song Liu" , "Yonghong Song" , "Jiri Olsa" , "Emil Tsalapatis" , "Joe Stringer" Cc: , , Subject: Re: [PATCH bpf 1/3] bpf, sockmap: Use sock_hold() instead of refcount_inc_not_zero() in lookup X-Mailer: aerc 0.21.0-0-g5549850facc2 References: <20260723-sockmap-lookup-tcp-leak-v1-0-1bbdc58ce514@rbox.co> <20260723-sockmap-lookup-tcp-leak-v1-1-1bbdc58ce514@rbox.co> In-Reply-To: <20260723-sockmap-lookup-tcp-leak-v1-1-1bbdc58ce514@rbox.co> On Thu Jul 23, 2026 at 7:33 AM EDT, Michal Luczaj wrote: > psock's hold on the looked up socket isn't dropped until sk_psock_drop() = -> > queue_rcu_work() -> sk_psock_destroy() runs, which happens only after the > entry is unlinked and an RCU grace period elapses. Since the lookup runs > under RCU, a non-NULL result guarantees sk_refcnt >=3D 1: > refcount_inc_not_zero() can never fail here. Use sock_hold() instead. > > Signed-off-by: Michal Luczaj Reviewed-by: Emil Tsalapatis > --- > net/core/sock_map.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/core/sock_map.c b/net/core/sock_map.c > index 9efbd8ca7db8..ca49bc7f8687 100644 > --- a/net/core/sock_map.c > +++ b/net/core/sock_map.c > @@ -392,8 +392,8 @@ static void *sock_map_lookup(struct bpf_map *map, voi= d *key) > sk =3D __sock_map_lookup_elem(map, *(u32 *)key); > if (!sk) > return NULL; > - if (sk_is_refcounted(sk) && !refcount_inc_not_zero(&sk->sk_refcnt)) > - return NULL; > + if (sk_is_refcounted(sk)) > + sock_hold(sk); > return sk; > } > =20 > @@ -1218,8 +1218,8 @@ static void *sock_hash_lookup(struct bpf_map *map, = void *key) > sk =3D __sock_hash_lookup_elem(map, key); > if (!sk) > return NULL; > - if (sk_is_refcounted(sk) && !refcount_inc_not_zero(&sk->sk_refcnt)) > - return NULL; > + if (sk_is_refcounted(sk)) > + sock_hold(sk); > return sk; > } > =20