From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 A3A273E5EE0 for ; Fri, 15 May 2026 07:15:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778829324; cv=none; b=f60x1xZt9ABGAcg/UTmbx16XYty/XieKnPYI5uy10MvajIKqzK619luCTnNQ3UeI2jOjY3RVvLaDsg+qtw0028fkLrbmCaj+6U2ShzkSVzIMJj8dHhbYgwzw7OcPdvfy2WQS6aD3P8sjXbLmxLEbmquHKScwbcBmBFFdM2szyg8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778829324; c=relaxed/simple; bh=Mqeo7wSQ9cvujMQ58+fSENQkR7cydw5nHM5UQoNm3Hs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=L0fHiVQw2hH2VDPuE30xMH1y5oPQYMFhwlfbBKqVfNRgVHE9E8fE6GhHG3ELy0kyTE8VdIQqa11DxRmZYC3opGeV+FAwQXQFJIohTx9wiA2CKNiNylFZHr4BK6iMkxLoEI0D2fWIiqbTK3zq7RTkN2HBCDX8D6pdU3zhg5mT8OI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuyanghuang.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=S9vPMdI6; arc=none smtp.client-ip=209.85.215.202 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--yuyanghuang.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="S9vPMdI6" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c82726f7b0bso3752900a12.3 for ; Fri, 15 May 2026 00:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778829319; x=1779434119; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=b3RlI8YNokBP9FYY4cx+xESI8OetO8LQ784NhfGUE9E=; b=S9vPMdI6vSCS+K/V4XWlsDip5fbD5OfCPU+ugohnoOo8A6tHTW7kKSxxdoJIK2r8wy t0iDOUzqnfNlQh0y3D24hKNnZTKetB41AqGVZFuz+IUlRdcnmK+Geglnv+3JOrWEn+dM DetHKi+AG9wq8CfAr4a3xBh1quad7SPnISyG4yr/X8bCFW2mFEMcK2ylvMmUlcw/u37z /GJX82SqfMFqtIdm1CZnXydHZbg3uTZArVCultcmCR/296Q0wYw5QqrL9hdfcMehPOZ+ seT0EqjpZHCSB8G+kloczHfLTMgTcr49LkjSlreTsNeOEXp5ZJwz0XQ82QTNT82RqHvH 68Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778829319; x=1779434119; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=b3RlI8YNokBP9FYY4cx+xESI8OetO8LQ784NhfGUE9E=; b=qG/wR8oi3Bace6uI4cIm9WJI1PZPz1geTKs8sfqDrru92G4ELMP3Ge5MmQdskJf3d7 JnvFNRtw2r7RTmXCJ4h4Q+a+F3V+PUP9lGqkqVU56q2UYuNwMve/bJOnFD2VkD74n6JF 1OQ7ikkc4WnWhTkXLdmP08nLIeSFVMCbxakXItr1sNtCfavQ9D6mvRgN2YOA70pNp/7S INceMQP46t/Py2uRT2BD413adQgpJFb2Ujjzs6+VhQz9V6mcErnBoj8Fv7rHK3QWlCFm hEEL6R2cCqLjtQIvzVl6hVu4+ABqUJP4VMwHU9E8BfBm4saBvsUNX4Jh/F1e6Z6/R3F/ gpkQ== X-Forwarded-Encrypted: i=1; AFNElJ/f6oqED2AxI2k3HMGFprNp6gX+t0e3zwEkfBsMBplIzedXZssljCQ3Th1Gv0dk1tziwTgfQvG0dJn8u0c=@vger.kernel.org X-Gm-Message-State: AOJu0YwQODgZToLSRUSA3lZbBbzBE2OQMhhYXBdu1FFzeMj47Wkb5quO 1+3X9rRcuPY3a5gm/E1GIMsFZ4PUBPRveDy5ahmV7Dz0dDXCVGib0N8EMZwCkAWZaVeAZKyERkf JGnYjP0i9d13lYwG7ewZAxRznYg== X-Received: from pfbdu16.prod.google.com ([2002:a05:6a00:2b50:b0:82f:9778:a429]) (user=yuyanghuang job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:90a9:b0:837:e9cc:d470 with SMTP id d2e1a72fcca58-83f33c9ec67mr3222990b3a.20.1778829318594; Fri, 15 May 2026 00:15:18 -0700 (PDT) Date: Fri, 15 May 2026 16:15:04 +0900 In-Reply-To: <20260515071504.2054786-1-yuyanghuang@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515071504.2054786-1-yuyanghuang@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515071504.2054786-3-yuyanghuang@google.com> Subject: [PATCH bpf-next 2/2] selftests/bpf: Add verification for BPF_PROG_QUERY attr size boundaries From: Yuyang Huang To: Yuyang Huang Cc: "David S. Miller" , Alexei Starovoitov , Andrew Lunn , Andrii Nakryiko , Daniel Borkmann , Eduard Zingerman , Eric Dumazet , Jakub Kicinski , Jiri Olsa , John Fastabend , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Nikolay Aleksandrov , Paolo Abeni , Shuah Khan , Simon Horman , Song Liu , Stanislav Fomichev , Yonghong Song , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" , Lorenzo Colitti Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Add a new selftest to verify that the BPF syscall (specifically BPF_PROG_QUERY) correctly respects the caller-declared attribute size boundaries: - Optional output fields (like query.revision) are not written if the caller-declared size ends before them. - Calls with a size below the mandatory minimum return -EINVAL. - Full-size calls still receive the optional fields normally. Cc: Maciej =C5=BBenczykowski Cc: Lorenzo Colitti Signed-off-by: Yuyang Huang Link: https://lore.kernel.org/r/CANP3RGfZTXM_u=3DE_atoomPZXutoQJ02nOMkCCR-Y= BZbOm2suWA@mail.gmail.com Tested with virtme-ng: # ./test_progs -t bpf_attr_size #17/1 bpf_attr_size/query_size_boundaries:OK #17/2 bpf_attr_size/query_mandatory_too_short_einval:OK #17 bpf_attr_size:OK Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED --- .../selftests/bpf/prog_tests/bpf_attr_size.c | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_attr_size.c diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_attr_size.c b/tools= /testing/selftests/bpf/prog_tests/bpf_attr_size.c new file mode 100644 index 000000000000..65fd717782de --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/bpf_attr_size.c @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2026 Google LLC */ +#include +#include +#include +#include +#include "test_tc_link.skel.h" +#include "tc_helpers.h" + +#define OLD_QUERY_SIZE offsetofend(union bpf_attr, query.prog_cnt) +#define FULL_QUERY_SIZE offsetofend(union bpf_attr, query.revision) +#define SHORT_QUERY_SIZE offsetofend(union bpf_attr, query.attach_type) + +static void test_query_size_boundaries(void) +{ + LIBBPF_OPTS(bpf_prog_attach_opts, opta); + LIBBPF_OPTS(bpf_prog_detach_opts, optd); + struct test_tc_link *skel; + union bpf_attr attr; + int fd, err; + + skel =3D test_tc_link__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_load")) + return; + + fd =3D bpf_program__fd(skel->progs.tc1); + + err =3D bpf_prog_attach_opts(fd, loopback, BPF_TCX_INGRESS, &opta); + if (!ASSERT_OK(err, "prog_attach")) + goto cleanup; + + /* 1. Old size: revision must not be written */ + memset(&attr, 0, sizeof(attr)); + attr.query.target_ifindex =3D loopback; + attr.query.attach_type =3D BPF_TCX_INGRESS; + + err =3D syscall(__NR_bpf, BPF_PROG_QUERY, &attr, OLD_QUERY_SIZE); + if (!ASSERT_OK(err, "query_old_size")) + goto detach; + + ASSERT_EQ(attr.query.prog_cnt, 1, "prog_cnt_written"); + ASSERT_EQ(attr.query.revision, 0, "revision_not_written"); + + /* 2. Full size: revision must be written normally */ + memset(&attr, 0, sizeof(attr)); + attr.query.target_ifindex =3D loopback; + attr.query.attach_type =3D BPF_TCX_INGRESS; + + err =3D syscall(__NR_bpf, BPF_PROG_QUERY, &attr, FULL_QUERY_SIZE); + if (!ASSERT_OK(err, "query_full_size")) + goto detach; + + ASSERT_EQ(attr.query.prog_cnt, 1, "prog_cnt_written"); + ASSERT_GT(attr.query.revision, 0, "revision_written"); + +detach: + err =3D bpf_prog_detach_opts(fd, loopback, BPF_TCX_INGRESS, &optd); + ASSERT_OK(err, "prog_detach"); +cleanup: + test_tc_link__destroy(skel); +} + +static void test_query_mandatory_too_short_einval(void) +{ + union bpf_attr attr; + int err; + + /* Below minimum size: must return -EINVAL */ + memset(&attr, 0, sizeof(attr)); + attr.query.target_ifindex =3D loopback; + attr.query.attach_type =3D BPF_TCX_INGRESS; + + err =3D syscall(__NR_bpf, BPF_PROG_QUERY, &attr, SHORT_QUERY_SIZE); + ASSERT_EQ(err, -1, "query_too_short_fails"); + ASSERT_EQ(errno, EINVAL, "query_too_short_einval"); +} + +void test_bpf_attr_size(void) +{ + if (test__start_subtest("query_size_boundaries")) + test_query_size_boundaries(); + if (test__start_subtest("query_mandatory_too_short_einval")) + test_query_mandatory_too_short_einval(); +} --=20 2.54.0.563.g4f69b47b94-goog