diff --git a/drgn-0.0.29.tar.gz b/drgn-0.0.29.tar.gz deleted file mode 100644 index 906d1ba..0000000 --- a/drgn-0.0.29.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16a465819cc62986f7db4cd5d27e8313f5826890ad7e6b1e856565020c25089e -size 830902 diff --git a/drgn-0.0.30.tar.gz b/drgn-0.0.30.tar.gz new file mode 100644 index 0000000..2279abe --- /dev/null +++ b/drgn-0.0.30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:828cb0a3ea424654314548d0f39765cad36c6c285ca0d9f53d0bd29f8f419a52 +size 853847 diff --git a/libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch b/libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch new file mode 100644 index 0000000..2c2a8dc --- /dev/null +++ b/libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch @@ -0,0 +1,37 @@ +From: Petr Tesarik +Date: Tue, 3 Dec 2024 13:54:40 +0100 +Subject: libdrgn: kdump: prepare for incompatible changes in + libkdumpfile-0.5.5 +Upstream: merged +Git-commit: 4e06cfdff158935eee725e726a63a5d9c9e57dab + +The kdump_get_typed_attr() function prototype changed in libkdumpfile +commit e182aeaf4d72 ("Make kdump_get_typed_attr() easier to use"). + +Signed-off-by: Petr Tesarik +--- + libdrgn/kdump.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libdrgn/kdump.c b/libdrgn/kdump.c +index 0bb594d1..4e5eea92 100644 +--- a/libdrgn/kdump.c ++++ b/libdrgn/kdump.c +@@ -318,9 +318,14 @@ struct drgn_error *drgn_program_cache_kdump_threads(struct drgn_program *prog) + + 1]; + snprintf(attr_name, sizeof(attr_name), FORMAT, i); + #undef FORMAT ++#if KDUMPFILE_VERSION >= KDUMPFILE_MKVER(0, 5, 5) ++ ks = kdump_get_typed_attr(prog->kdump_ctx, attr_name, ++ KDUMP_BLOB, &prstatus_attr.val); ++#else + prstatus_attr.type = KDUMP_BLOB; + ks = kdump_get_typed_attr(prog->kdump_ctx, attr_name, + &prstatus_attr); ++#endif + if (ks != KDUMP_OK) { + return drgn_error_format(DRGN_ERROR_OTHER, + "kdump_get_typed_attr(%s): %s", +-- +2.47.1 + diff --git a/libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch b/libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch new file mode 100644 index 0000000..79ad927 --- /dev/null +++ b/libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch @@ -0,0 +1,86 @@ +From: Petr Tesarik +Date: Mon, 2 Dec 2024 17:38:24 +0100 +Subject: libdrgn: kdump: simplify getting the PRSTATUS attributes +Upstream: merged +Git-commit: 885a3209f3603593fb89327c1072f94e5862ffbb + +Since libkdumpfile commit 5b044292abe9 ("Clarify and fix attribute data +lifetime") changes the lifetime of attribute values retrieved with +kdump_attr_ref_get(), the extra reference would keep the PRSTATUS blob +around even after kdump_free(). + +However, the attribute hierarchy cannot change while iterating over the +PRSTATUS attributes, so it is not necessary to take an attribute reference +and we can use kdump_get_typed_attr(). + +The attribute blob itself should not change either, but it is a good idea +to keep its data pinned, because a raw pointer to it is stored in the +drgn_thread_set hash table. If some code tries to modify the PRSTATUS +attribute data, the attempt will fail with KDUMP_ERR_BUSY rather than leave +a dangling pointer in the hash table and possibly cause a UAF bug later. + +The blob pin does not prevent freeing the blob when the blob reference +count reaches zero. + +Signed-off-by: Petr Tesarik +--- + libdrgn/kdump.c | 28 ++++++++++------------------ + 1 file changed, 10 insertions(+), 18 deletions(-) + +diff --git a/libdrgn/kdump.c b/libdrgn/kdump.c +index 09efd965..0bb594d1 100644 +--- a/libdrgn/kdump.c ++++ b/libdrgn/kdump.c +@@ -299,39 +299,31 @@ struct drgn_error *drgn_program_cache_kdump_threads(struct drgn_program *prog) + } + + /* +- * Note that in the following loop we never call kdump_attr_unref() on +- * prstatus_ref, nor kdump_blob_unpin() on the prstatus blob that we get +- * from libkdumpfile. Since drgn is completely read-only as a consumer +- * of that library, we "leak" both the attribute reference and blob pin +- * until kdump_free() is called which will clean up everything for us. ++ * Note that in the following loop we never call kdump_blob_unpin() on ++ * the prstatus blob that we get from libkdumpfile. Since drgn never ++ * modifies the PRSTATUS attributes (neither directly nor indirectly), ++ * we "leak" the blob pin until kdump_free() is called, which will ++ * clean up everything for us. + */ + for (i = 0; i < ncpus; i++) { +- /* Enough for the longest possible PRSTATUS attribute name. */ +- kdump_attr_ref_t prstatus_ref; + kdump_attr_t prstatus_attr; + void *prstatus_data; + size_t prstatus_size; + + #define FORMAT "cpu.%" PRIuFAST64 ".PRSTATUS" ++ /* Enough for the longest possible PRSTATUS attribute name. */ + char attr_name[sizeof(FORMAT) + - sizeof("%" PRIuFAST64) + + max_decimal_length(uint_fast64_t) + + 1]; + snprintf(attr_name, sizeof(attr_name), FORMAT, i); + #undef FORMAT +- ks = kdump_attr_ref(prog->kdump_ctx, attr_name, &prstatus_ref); +- if (ks != KDUMP_OK) { +- return drgn_error_format(DRGN_ERROR_OTHER, +- "kdump_attr_ref(%s): %s", +- attr_name, +- kdump_get_err(prog->kdump_ctx)); +- } +- +- ks = kdump_attr_ref_get(prog->kdump_ctx, &prstatus_ref, +- &prstatus_attr); ++ prstatus_attr.type = KDUMP_BLOB; ++ ks = kdump_get_typed_attr(prog->kdump_ctx, attr_name, ++ &prstatus_attr); + if (ks != KDUMP_OK) { + return drgn_error_format(DRGN_ERROR_OTHER, +- "kdump_attr_ref_get(%s): %s", ++ "kdump_get_typed_attr(%s): %s", + attr_name, + kdump_get_err(prog->kdump_ctx)); + } +-- +2.47.1 + diff --git a/python-drgn.changes b/python-drgn.changes index 6266591..7bd166c 100644 --- a/python-drgn.changes +++ b/python-drgn.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 30 13:01:09 UTC 2024 - Petr Tesařík + +- Update to drgn-0.0.30: + * Linux 6.13 support + * Support for symbols without debuginfo + * Use Python 3.13 enhanced REPL when available + * Add a 'stat' subcommand to contrib/cgroup.py + * Many bug fixes +- API compatibility with libkdumpfile-0.5.5: + * libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch + * libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch + ------------------------------------------------------------------- Wed Oct 9 06:46:34 UTC 2024 - Petr Tesařík diff --git a/python-drgn.spec b/python-drgn.spec index 76b15a3..c3e12b1 100644 --- a/python-drgn.spec +++ b/python-drgn.spec @@ -21,13 +21,15 @@ %{?!python_module:%define python_module() python3-%{**}} Name: python-drgn -Version: 0.0.29 +Version: 0.0.30 Release: 0 Summary: Scriptable debugger library License: LGPL-2.1-or-later Group: Development/Tools/Debuggers URL: https://github.com/osandov/drgn Source: https://github.com/osandov/drgn/archive/refs/tags/v%{version}.tar.gz#/drgn-%{version}.tar.gz +Patch1: libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch +Patch2: libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: autoconf @@ -50,6 +52,7 @@ for easy, expressive scripting in Python. %prep %setup -q -n drgn-%{version} +%autopatch -p1 %build export CFLAGS="%{optflags}"