From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 747F34078E1 for ; Tue, 1 Sep 2026 01:47:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788227304; cv=none; b=WppRA5oU1q7IDgqygnjbs64H+XjG5cmowvtjL3+y8lW/bZ6ltcxmuHrNwMSg3VU421+ZbpBI1Ry0misv+5EJhFGAYmEx1pq5mzGvIi+BQFR5yT+jmOTwXMmwcjK5WEog0cssozpioYCaAPY/f1Mnwe/crYFrXoW3SXzupGdTl1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788227304; c=relaxed/simple; bh=sEqoE/JOspzAh4I7PK3klxs+bcydlAXZlE1An4cO3Ow=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AVrtgWxLzSLxd9XnZ0HaN/SWRR2OHlflzicrZiLyLhnYHQu4Ro6hjBezdL44SFxLy/hEPMdsS963DfSH9SiRP2J1eFXEcbbggmrnPpBREqBwEHneMcpNk/busckYBMFKqddG1uu4Lne+r+YbpKMrqXgJB7txTKdA3xdowAthVmI= 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=WT/nKl5D; arc=none smtp.client-ip=209.85.214.181 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="WT/nKl5D" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2d032846c95so46816885ad.1 for ; Mon, 31 Aug 2026 18:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788227265; x=1788832065; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=+/E7TIF3u/RGKDlz/vbcdmW4BNPGxEY5+7Q5goscvkM=; b=WT/nKl5Dzj/WdzvVmNlFS3qRcJ375vzVwNdet9nLaZ8IIDZtK9gzZoDSX6hPXjq6Cr 9rmnpEDOPNzGvDWiZqJahzs7Nc+zFsq58rXSgQd5fJR5y5LlfN4Mdl7bOgp4JR+sJIgM y/FO0WmUaI8rhMbPdHqKT4Wbqw+eJ5n5e/z0twM08EC59vGmEtxFEg/warf3OPl52xWO 4ZPc73X1HddUtSJQdIhXQl0l6URyWuNn3CRCx8KvzISwLzXkAcbp+M+A788RkO0WJoS9 SXVUxko9F8D1jLL47HNWBoJzOrqaKWUTB0tgWu28QDWE4wIdn/cXtR3K6pWDVLmjE3fi MuHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788227265; x=1788832065; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+/E7TIF3u/RGKDlz/vbcdmW4BNPGxEY5+7Q5goscvkM=; b=own55D2Ys2/CRzPG/Dnkd+rdQPZoOxLqIWazappDL4nmy2qDomKFwKOfegaVQ+jisR /KaN1hEVjeBiHYEeCjBdKtJwf5NUkv4b97vO4ZJejfqnslqYX6+KqId7hLvGCNTaVc6T DMKOvp3hupv3HnKnxrbDneqGRE/RUwxBlY4MSvjxgQ9sP5rRY/CWwp3m65JFKQCYO2DN ilhLZvTnMmLrsq1TNAYjBfLfGiMsLs6HAVpU1Z7u9A+h8JBqJXdmbE/rxbbs9PH9jYxl 2ki108EAX4QTAO1Cfel/gzmHTeuIYbMXvKqiUILdYJvNjsH7zBcOdC4EZfWyB19BuO5a a0bg== X-Forwarded-Encrypted: i=1; AKwUvBzRQU40LiGhx0ETw7CHv2SAVV/WtqNWxjuA5K965E1LC/zns90N9RK7yyuCLbshCChgAG2ClRlDPvEZpEE=@vger.kernel.org X-Gm-Message-State: AFuF++n2FM+hrCtAvTeWyO7j7iTHJyut9hxaRGD2sVCK7WgSa+opL+jT 5bhOhHqdW+g1y9tQZ6xHByrG8dn64aP5i6v/c2guJNytpP9d7TvgWuPy X-Gm-Gg: AYBFou2FZGB6DCM+MuDlP8Y1/eBEWpCKTkaVSud5I3zG6eVx9tcIt1yc//FZ9sr3KhL fRO0CE266nFHUd0O4iy0bR35xHSa4b0v0ld1v92eTQCz/3jwQiwy8229POp6ytRuNg4dokvYk6Y fznzHfX2G+2PsNdvam/lpVoVLcoopW+14k9xsWAcw8hYDzTByViTffXMMj1qWpuwZtPG09wwNC1 EuRwZ5atGzhULOtsNqdHTceVdxNOm/H8NIATgSz0p2IJdrrBhJD8ki6fE8w7HmvO8/8URX/shkM 5S24w1Pd1VmC73XeEOhDlq6LC2thANeb4ROA+rXrvBWIh0diviSH31lZ1pO0GZK7kOtbGpE+elB Tr2TwQJyO8LD7wD33209KPNRCs2vsIMG7hjPfP2zkBXFfVYl1xBRBfJoOC2qjRpChOn2x/GzpRs g/9Q9a+09x3QijHnp8/Nwbx9hKgU03OiZRQ2MibGorZpmTVBJgf1b/6S0UBexmi5pas88aENCHS T0eLIKxwjVS8CAlUjozSBdGu3OfOKtLcsGRSti/gZlmWpptRcSztw== X-Received: by 2002:a17:903:4686:b0:2cf:c543:2c7e with SMTP id d9443c01a7336-2d94a8f455amr62657115ad.10.1788227265233; Mon, 31 Aug 2026 18:47:45 -0700 (PDT) Received: from secrnd-cstp.tailb7f510.ts.net ([125.131.91.97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d911a9651csm27053495ad.21.2026.08.31.18.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 18:47:42 -0700 (PDT) From: Sanghyun Park To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , bpf@vger.kernel.org Cc: Sanghyun Park , Leon Hwang , John Fastabend , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Shuah Khan , Stanislav Fomichev , Pu Lehui , Suchit Karunakaran , Xu Kuohai , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v5 1/2] bpf: Validate program attach type during link update Date: Tue, 1 Sep 2026 10:47:09 +0900 Message-ID: <20260901014713.3502900-2-sanghyun.park.cnu@gmail.com> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cgroup link updates compare only the program type. Programs verified for different hooks can share a type, so a UDP6 sock_addr program can replace a UDP4 program and write beyond the four-byte ipc.addr field in the stack-local struct ipcm_cookie. The same gap permits incompatible LSM_MAC and LSM_CGROUP replacements. Validate every replacement program against the link attach type before dispatching to the link-specific update operation. Keep the CGROUP_SKB CAP_NET_ADMIN check at initial attach so pinned or delegated link FDs can still be updated after a capability drop. Fixes: 0c991ebc8c69 ("bpf: Implement bpf_prog replacement for an active bpf_cgroup_link") Acked-by: Leon Hwang Signed-off-by: Sanghyun Park --- v5: - Fold the link-create permission check call onto one line. v4: https://lore.kernel.org/r/20260831023918.1857658-1-sanghyun.park.cnu@gmail.com - Validate every program link update through the shared attach-type helper. - Fold the LSM attach-flavor check into that helper. - Keep the CGROUP_SKB permission check in the attach-only wrapper and rename the wrapper to describe that role. - Follow the preferred BPF multi-line comment style. - Add focused regression selftests as patch 2/2. v3: https://lore.kernel.org/r/20260821084726.3769957-2-sanghyun.park.cnu@gmail.com - Factor the CGROUP_SKB CAP_NET_ADMIN check into an attach-only helper. v2: https://lore.kernel.org/r/20260818061021.2551771-2-sanghyun.park.cnu@gmail.com - Extend validation from cgroup sock_addr programs to all cgroup program types, including exact LSM attach flavors. - Preserve legacy CGROUP_SKB ingress/egress replacement compatibility. - Keep the CGROUP_SKB CAP_NET_ADMIN check on attach, not link update. v1: https://lore.kernel.org/r/20260805052858.2390918-3-sanghyun.park.cnu@gmail.com --- kernel/bpf/syscall.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 6874ba1424af..2bcd3f3a2a55 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -4481,14 +4481,9 @@ static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog, case BPF_PROG_TYPE_CGROUP_SOCK_ADDR: case BPF_PROG_TYPE_CGROUP_SOCKOPT: case BPF_PROG_TYPE_SK_LOOKUP: + case BPF_PROG_TYPE_LSM: return attach_type == prog->expected_attach_type ? 0 : -EINVAL; case BPF_PROG_TYPE_CGROUP_SKB: - if (!bpf_token_capable(prog->aux->token, CAP_NET_ADMIN)) - /* cg-skb progs can be loaded by unpriv user. - * check permissions at attach time. - */ - return -EPERM; - ptype = attach_type_to_prog_type(attach_type); if (prog->type != ptype) return -EINVAL; @@ -4542,6 +4537,20 @@ static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog, } } +static int bpf_prog_attach_check_perm(const struct bpf_prog *prog, + enum bpf_attach_type attach_type) +{ + /* + * CGROUP_SKB programs can be loaded by unprivileged users, so check + * permissions at attach time. + */ + if (prog->type == BPF_PROG_TYPE_CGROUP_SKB && + !bpf_token_capable(prog->aux->token, CAP_NET_ADMIN)) + return -EPERM; + + return bpf_prog_attach_check_attach_type(prog, attach_type); +} + static bool is_cgroup_prog_type(enum bpf_prog_type ptype, enum bpf_attach_type atype, bool check_atype) { @@ -4606,7 +4615,7 @@ static int bpf_prog_attach(const union bpf_attr *attr) if (IS_ERR(prog)) return PTR_ERR(prog); - if (bpf_prog_attach_check_attach_type(prog, attr->attach_type)) { + if (bpf_prog_attach_check_perm(prog, attr->attach_type)) { bpf_prog_put(prog); return -EINVAL; } @@ -5805,8 +5814,7 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr) if (IS_ERR(prog)) return PTR_ERR(prog); - ret = bpf_prog_attach_check_attach_type(prog, - attr->link_create.attach_type); + ret = bpf_prog_attach_check_perm(prog, attr->link_create.attach_type); if (ret) goto out; @@ -5968,6 +5976,10 @@ static int link_update(union bpf_attr *attr) goto out_put_progs; } + ret = bpf_prog_attach_check_attach_type(new_prog, link->attach_type); + if (ret) + goto out_put_progs; + if (link->ops->update_prog) ret = link->ops->update_prog(link, new_prog, old_prog); else -- 2.48.1