From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.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 6D8E230D410 for ; Wed, 24 Jun 2026 05:16:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782278167; cv=none; b=Pju6I6pbfTTNmazHIHRRDcxJi/ItdENOZ3oCu8LpBep/ELEjiiWOLKeoEOzw4c9FDHwPO9ZnJAcR0H1CegDocxpayQxt5dHqDeqZZgA3bqAQkYRN3lZqk7RvN0Ljk4c9OtzmsfV4NqBObvjBru0B3IqteAx53+K0Fhsx6GToCRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782278167; c=relaxed/simple; bh=U41WycCXJkj4twqrVFPf6ahvLkQuMOIOUkjLVn9c6ZM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cP0zw9hA/IusMGY7z+JMYk3I8+hmhapW6dsv6FvDNoZ7jKF2uzTP9UGw3pnFx+OcHt4kTye2E6OXHiMvJRHC9sb1uLVHg5PJu8tW9d4trL9C1sIwQrl/sXLusJnpk05VIIfCj52FqrSqfmGcwTqKHYQ+KNpPXytMJZCqY2xxT3o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=u3Ubgdfm; arc=none smtp.client-ip=74.125.82.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--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="u3Ubgdfm" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-30bcbb34e57so793781eec.1 for ; Tue, 23 Jun 2026 22:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782278165; x=1782882965; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LNRhUfPfnFHw5PlWbwx2PQPSrRiKBvtXr39D6eDjMi4=; b=u3UbgdfmP2hMt8NaTCDSDt+EbbLENkSV91PMNL4Hyg9swjc2cNkpNxGK1sE+UVO1uQ CfQlsxIPLK4K7GEvtVKQi/n86HDtXrKqMVeiJQ9qEtVCN/TJyNV1NRmykwKcGrXA618R eIsVSm6WNJcdUir3W9bs0FJhQR9HwC6Krz/wbBJk6ZG02HNnurL9stdvS5yRyWKuFT6d pZEoxNBq8R5MceSmKeT09TRECP+YSKtwwE/CyBWWv7WeXCwawQKZnZkbdAhUWmBDTiAZ kG5XGsZIM+HHC/Ocf0ecUk8HmPNFlOm2st2eVgv8eyFZEZBiDp2jrf5/qb9Pnv/eHJeh XGHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782278165; x=1782882965; h=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=LNRhUfPfnFHw5PlWbwx2PQPSrRiKBvtXr39D6eDjMi4=; b=QzYApWqQHVF7tBaTsPGqKctSy/bPS3xKm1t3b9ZeltDXmhS3/UGhK/3dHsgdQUqdWU 25Qxu6HK/Z7Lpm15B2ZeTKJrv3ng0rmTz4Qdxm4vpbRgM45+QQ9hOcEA9zaXakoStxNP /usjwOR0izNEFqgz3D9C13b5uW+ZCUO08rUYsmcqrtu/rIxRthSCXdNwshpC2rKKunE/ mTIgepEtwbvwv/BhFtpL22bExB/pK0GB22bUfLHyD8J2d6nMSSIx5dig7OInirmfYObn evRrFVLUmATvN/XFhOHvdCdeWVldtFmhv1dFBluVCDJJwLHwRduwEJNUNYpITkAWUyQQ DYIw== X-Forwarded-Encrypted: i=1; AFNElJ9sjm4iUVTBtc2n4tXyelj4DI/LvW7/CF/U+eVej9W7KAZTH2DvA60N4nFKfXV/oNPA1BgN4XEujo1BzjY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5QzhYQG7ZQLiLAT5Q/Z9gj2POGwc03w9z06cX8236VjVE9KSl teamQITbeXNDdvLQKoJwkBAt8x7fTCpL1nk45YtTRMVWXVOllXNFCK7mFsD0hQzM+x2sPEk+PNf WlKBHiHf8Aw== X-Received: from dlbqd19.prod.google.com ([2002:a05:7023:b13:b0:138:9f7:2b4a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2220:b0:138:3613:db8 with SMTP id a92af1059eb24-139d0bf3371mr1608517c88.3.1782278165106; Tue, 23 Jun 2026 22:16:05 -0700 (PDT) Date: Tue, 23 Jun 2026 22:15:28 -0700 In-Reply-To: <20260624051535.3584977-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260623053515.2677888-1-irogers@google.com> <20260624051535.3584977-1-irogers@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260624051535.3584977-12-irogers@google.com> Subject: [PATCH v2 10/16] perf python: Validate attribute setters in pyrf_evsel From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Type: text/plain; charset="UTF-8" If val is NULL when setting an attribute, PyErr_SetString should be called as deleting the attribute isn't supported. In addition, ensure PyErr_Occurred is checked before setting the attribute to avoid setting a garbage value. Fixes: 877108e42b1b ("perf tools: Initial python binding") Signed-off-by: Ian Rogers --- tools/perf/util/python.c | 89 ++++++++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 4bf37e2afb18..657b054f5e51 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -2296,6 +2296,11 @@ static int pyrf_evsel__set_tracking(PyObject *self, PyObject *val, void *closure CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + if (val == NULL) { + PyErr_SetString(PyExc_TypeError, "cannot delete attribute"); + return -1; + } + is_true = PyObject_IsTrue(val); if (is_true < 0) return -1; @@ -2307,11 +2312,21 @@ static int pyrf_evsel__set_tracking(PyObject *self, PyObject *val, void *closure static int pyrf_evsel__set_attr_config(PyObject *self, PyObject *val, void *closure __maybe_unused) { struct pyrf_evsel *pevsel = (void *)self; + unsigned long long new_val; CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); - pevsel->evsel->core.attr.config = PyLong_AsUnsignedLongLong(val); - return PyErr_Occurred() ? -1 : 0; + if (val == NULL) { + PyErr_SetString(PyExc_TypeError, "cannot delete attribute"); + return -1; + } + + new_val = PyLong_AsUnsignedLongLong(val); + if (PyErr_Occurred()) + return -1; + + pevsel->evsel->core.attr.config = new_val; + return 0; } static PyObject *pyrf_evsel__get_attr_config(PyObject *self, void *closure __maybe_unused) @@ -2326,11 +2341,21 @@ static PyObject *pyrf_evsel__get_attr_config(PyObject *self, void *closure __may static int pyrf_evsel__set_attr_read_format(PyObject *self, PyObject *val, void *closure __maybe_unused) { struct pyrf_evsel *pevsel = (void *)self; + unsigned long long new_val; CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); - pevsel->evsel->core.attr.read_format = PyLong_AsUnsignedLongLong(val); - return PyErr_Occurred() ? -1 : 0; + if (val == NULL) { + PyErr_SetString(PyExc_TypeError, "cannot delete attribute"); + return -1; + } + + new_val = PyLong_AsUnsignedLongLong(val); + if (PyErr_Occurred()) + return -1; + + pevsel->evsel->core.attr.read_format = new_val; + return 0; } static PyObject *pyrf_evsel__get_attr_read_format(PyObject *self, void *closure __maybe_unused) @@ -2345,11 +2370,21 @@ static PyObject *pyrf_evsel__get_attr_read_format(PyObject *self, void *closure static int pyrf_evsel__set_attr_sample_period(PyObject *self, PyObject *val, void *closure __maybe_unused) { struct pyrf_evsel *pevsel = (void *)self; + unsigned long long new_val; CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); - pevsel->evsel->core.attr.sample_period = PyLong_AsUnsignedLongLong(val); - return PyErr_Occurred() ? -1 : 0; + if (val == NULL) { + PyErr_SetString(PyExc_TypeError, "cannot delete attribute"); + return -1; + } + + new_val = PyLong_AsUnsignedLongLong(val); + if (PyErr_Occurred()) + return -1; + + pevsel->evsel->core.attr.sample_period = new_val; + return 0; } static PyObject *pyrf_evsel__get_attr_sample_period(PyObject *self, void *closure __maybe_unused) @@ -2364,11 +2399,21 @@ static PyObject *pyrf_evsel__get_attr_sample_period(PyObject *self, void *closur static int pyrf_evsel__set_attr_sample_type(PyObject *self, PyObject *val, void *closure __maybe_unused) { struct pyrf_evsel *pevsel = (void *)self; + unsigned long long new_val; CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); - pevsel->evsel->core.attr.sample_type = PyLong_AsUnsignedLongLong(val); - return PyErr_Occurred() ? -1 : 0; + if (val == NULL) { + PyErr_SetString(PyExc_TypeError, "cannot delete attribute"); + return -1; + } + + new_val = PyLong_AsUnsignedLongLong(val); + if (PyErr_Occurred()) + return -1; + + pevsel->evsel->core.attr.sample_type = new_val; + return 0; } static PyObject *pyrf_evsel__get_attr_sample_type(PyObject *self, void *closure __maybe_unused) @@ -2392,11 +2437,21 @@ static PyObject *pyrf_evsel__get_attr_size(PyObject *self, void *closure __maybe static int pyrf_evsel__set_attr_type(PyObject *self, PyObject *val, void *closure __maybe_unused) { struct pyrf_evsel *pevsel = (void *)self; + unsigned long new_val; CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); - pevsel->evsel->core.attr.type = PyLong_AsUnsignedLong(val); - return PyErr_Occurred() ? -1 : 0; + if (val == NULL) { + PyErr_SetString(PyExc_TypeError, "cannot delete attribute"); + return -1; + } + + new_val = PyLong_AsUnsignedLong(val); + if (PyErr_Occurred()) + return -1; + + pevsel->evsel->core.attr.type = new_val; + return 0; } static PyObject *pyrf_evsel__get_attr_type(PyObject *self, void *closure __maybe_unused) @@ -2411,11 +2466,21 @@ static PyObject *pyrf_evsel__get_attr_type(PyObject *self, void *closure __maybe static int pyrf_evsel__set_attr_wakeup_events(PyObject *self, PyObject *val, void *closure __maybe_unused) { struct pyrf_evsel *pevsel = (void *)self; + unsigned long new_val; CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); - pevsel->evsel->core.attr.wakeup_events = PyLong_AsUnsignedLong(val); - return PyErr_Occurred() ? -1 : 0; + if (val == NULL) { + PyErr_SetString(PyExc_TypeError, "cannot delete attribute"); + return -1; + } + + new_val = PyLong_AsUnsignedLong(val); + if (PyErr_Occurred()) + return -1; + + pevsel->evsel->core.attr.wakeup_events = new_val; + return 0; } static PyObject *pyrf_evsel__get_attr_wakeup_events(PyObject *self, void *closure __maybe_unused) -- 2.55.0.rc0.799.gd6f94ed593-goog