From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 852C8478E5D for ; Mon, 29 Jun 2026 17:27:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782754046; cv=none; b=VfTTVk+LI3M3wLx50zoSbnGUNi14TG6GFWJHfTpbjmw7ztowGH4hYgB5/u5HOyWp3uwr5N6Ba4d9fOxVbD/TamDv1puAWIbVvZwyEM530i1MKku1QWX7TcamgSBiO674QNFdko0acxa1z1wiuAxYML6ABYrfIPWhVBVB0DDwsoY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782754046; c=relaxed/simple; bh=vmfVuXC1Kci8WIGxW5bjMPz0qeJm5HtuIa4PggV5cAg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=abP//8TuUUQHabIrFV4A6FF0vfwdu+b4uhRH0ncj8jG+jEoMiKYilAM5WxQV4y3AVYaqEpGzOegnvbkeggMzakSxE9hCIFg1NjHfcoeLem1wdyDkmasYS6qOYIyX959mGdwsWlFw5KdndlRVjnB55cFhDUi5cHzDom3eME5wUBI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mcNUeaGr; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mcNUeaGr" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-8471013fac2so837096b3a.1 for ; Mon, 29 Jun 2026 10:27:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782754045; x=1783358845; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ijO00ApSrJ4JfinG+iOaoegiY2Fv72WhceXqrwbihis=; b=mcNUeaGrwHHb6mK4agvncycFBMAzRnpl5U8HcrFILADiR4xjAZunvQLS9JtT91sna+ ZmTIB6i8TmMEIpPLjQaF4C7CJb55CWm3dOu3CRmVl7qab0OG8tsjiZ499IEQ/DI6Ie2w 7diXSoyvOQT7vw1ly68lKN56qtxbJXEP+HLUsimUYjbvtGiMmasThZRzX5XSI6n28T2K l/dG06PLj85SqUgYDBaCsKDxEbbO3s+TfaTet6eTTPVkUuD3uW5GLsqKdXeYmJyeGi/o LUtAlQZcMc+I8x4KTeKrdKe+F1ZAprrP8m8z8pIX4pgbicAh4DezcndQZM1TgQCIBPWK juQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782754045; x=1783358845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ijO00ApSrJ4JfinG+iOaoegiY2Fv72WhceXqrwbihis=; b=CYA0mZwmx3IhTmRc66aK1EcF87Kfgv5gbERIAZ8G1QBJ2egpQfNQFYv0xR9BUDXSKW 8cHKVyQGfhEyISrhVd98Gcu86x0DVMXuA7VCUsX8zYBZNp6EbF9ltaFvwEItXtD1VsVc Ex/sA7Ggv9yFd6OEuSWmD7q4aKgFqjmvCvf78OGoKdcb6MesydQjzZcH/MIbJaMwWQCV HOzFDlYAWU16FSzFZe53yrC2R7eVJiZe0ZoEMRMUqeoy1EgPvYNvqRapwoAhdudbsURV sXV98TLyWrjLlJGHmLrJlwC4QILmvRo/MUA6u/6tIDJzvlvJx9ZyGv2WM5/76jB/wSLY zV3Q== X-Forwarded-Encrypted: i=1; AHgh+RqEoY9JM+iSVSKx1UG6HiLoV4815iQOpS77TAcX65xWhK5bWavPeRJkfmLorfq4HFCoT/Hfcoza3ntpiaE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywuqgiu60m2LBl7BKktgCiMboJT+lTbg+TKm3kRe53eOkdyXLy6 s3fZmffv0xl+GtpIC28PMMrlxWclmn42/Fj9uKEnpbUJXbGb2az5Dgkc X-Gm-Gg: AfdE7clM8XpeGUlTMVS2Ws3Mhm/oEW8JjqG6eYjrLeCM4s0zUAETgfMlEId7uxDiPWc GNvp0S3u45nz/8pTmWFrPA0fCAuNUSOFyA+nVEN4a29msvjLeHKJD7g3XseTpmD9TT3ZTFwAVwC 0dhyq9islkw8q7Uzs6ZXRRIZ2hiO/EvirkbfB38QfMJzIY5RkSe96lUJOk5xKLtIcefDI299wjq nqMAZQEvUrz3tI8FFM06hUWrt8uG/pY9gUIs4z64XehlhAH30Kl2pnesc4uoy/nbivp2Q/d6wlb ORBbQNVGgRp/2ykr/oKLEAUlzMEvcTdXXtA0h597lhEIvDlSo4GcnCMaf0a2sFXvNYbTpeN7pg8 cap7lfRKFxHyGWFKd6/ikwWKROs6i2tnEwaQJYCAEuVY8sE/H7ihnbNcOiunvp2sbsLnA6MpXaP turmeUzKWzNwpynEYX5/U3woHZ54Bo2GSxPI6+meHcH1u+eGhWIPQ= X-Received: by 2002:a05:6a00:809:b0:847:9151:3409 with SMTP id d2e1a72fcca58-8479f28fe73mr310446b3a.55.1782754044625; Mon, 29 Jun 2026 10:27:24 -0700 (PDT) Received: from cps-manycore-1.. ([147.46.174.222]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a039f2afsm78542b3a.53.2026.06.29.10.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 10:27:24 -0700 (PDT) From: Sechang Lim To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , John Fastabend , Eduard Zingerman , Kumar Kartikeya Dwivedi , "David S . Miller" , Jakub Kicinski , Jesper Dangaard Brouer Cc: Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Stanislav Fomichev , Emil Tsalapatis , Lorenz Bauer , Jakub Sitnicki , Jiayuan Chen , Shuah Khan , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v3 1/2] bpf, sockmap: disallow update and delete from tc, xdp and flow_dissector Date: Mon, 29 Jun 2026 17:27:00 +0000 Message-ID: <20260629172704.1302218-2-rhkrqnwk98@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260629172704.1302218-1-rhkrqnwk98@gmail.com> References: <20260629172704.1302218-1-rhkrqnwk98@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit sock_map_update_common() and __sock_map_delete() hold stab->lock and call sock_map_unref() -> sock_map_del_link(), which takes sk_callback_lock for write. That gives the order stab->lock -> sk_callback_lock. The reverse order comes from the SK_SKB stream parser. sk_psock_strp_data_ready() holds sk_callback_lock for read, and after the verdict tcp_bpf_strp_read_sock() acks the consumed data inline via __tcp_cleanup_rbuf(). The ACK goes out egress, where a sched_cls program deletes from the sockmap and takes stab->lock: WARNING: possible circular locking dependency detected ------------------------------------------------------ syz.9.8824 is trying to acquire lock: (&stab->lock){+.-.}-{3:3}, at: __sock_map_delete net/core/sock_map.c:421 but task is already holding lock: (clock-AF_INET){++.-}-{3:3}, at: sk_psock_strp_data_ready net/core/skmsg.c:1173 -> #1 (clock-AF_INET){++.-}-{3:3}: _raw_write_lock_bh sock_map_del_link net/core/sock_map.c:167 sock_map_unref net/core/sock_map.c:184 sock_map_update_common net/core/sock_map.c:509 sock_map_update_elem_sys net/core/sock_map.c:588 map_update_elem kernel/bpf/syscall.c:1805 -> #0 (&stab->lock){+.-.}-{3:3}: _raw_spin_lock_bh __sock_map_delete net/core/sock_map.c:421 sock_map_delete_elem net/core/sock_map.c:452 bpf_prog_06044d24140080b6 tcx_run net/core/dev.c:4451 sch_handle_egress net/core/dev.c:4541 __dev_queue_xmit net/core/dev.c:4808 ... tcp_bpf_strp_read_sock net/ipv4/tcp_bpf.c:701 strp_data_ready net/strparser/strparser.c:402 sk_psock_strp_data_ready net/core/skmsg.c:1174 tcp_data_queue net/ipv4/tcp_input.c:5661 Possible unsafe locking scenario: CPU0 CPU1 ---- ---- rlock(clock-AF_INET); lock(&stab->lock); lock(clock-AF_INET); lock(&stab->lock); *** DEADLOCK *** A tc, xdp or flow_dissector program has no reason to update or delete a sockmap, and redirect does not go through here. Drop them from may_update_sockmap() so the verifier rejects it. It also closes the matching sockhash inversion. Suggested-by: John Fastabend Signed-off-by: Sechang Lim --- kernel/bpf/verifier.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 25aea4271cd0..58d766c34626 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -8489,11 +8489,7 @@ static bool may_update_sockmap(struct bpf_verifier_env *env, int func_id) return true; break; case BPF_PROG_TYPE_SOCKET_FILTER: - case BPF_PROG_TYPE_SCHED_CLS: - case BPF_PROG_TYPE_SCHED_ACT: - case BPF_PROG_TYPE_XDP: case BPF_PROG_TYPE_SK_REUSEPORT: - case BPF_PROG_TYPE_FLOW_DISSECTOR: case BPF_PROG_TYPE_SK_LOOKUP: return true; default: -- 2.43.0