diff --git a/1000-core-fix-a-null-reference-case-in-load_from_path.patch b/10000-core-fix-a-null-reference-case-in-load_from_path.patch similarity index 100% rename from 1000-core-fix-a-null-reference-case-in-load_from_path.patch rename to 10000-core-fix-a-null-reference-case-in-load_from_path.patch diff --git a/1001-sysctl-Don-t-pass-null-directive-argument-to-s.patch b/10001-sysctl-Don-t-pass-null-directive-argument-to-s.patch similarity index 100% rename from 1001-sysctl-Don-t-pass-null-directive-argument-to-s.patch rename to 10001-sysctl-Don-t-pass-null-directive-argument-to-s.patch diff --git a/1002-exit-status-introduce-EXIT_EXCEPTION-mapping-to-255.patch b/10002-exit-status-introduce-EXIT_EXCEPTION-mapping-to-255.patch similarity index 100% rename from 1002-exit-status-introduce-EXIT_EXCEPTION-mapping-to-255.patch rename to 10002-exit-status-introduce-EXIT_EXCEPTION-mapping-to-255.patch diff --git a/1003-main-don-t-freeze-PID-1-in-containers-exit-with-non-.patch b/10003-main-don-t-freeze-PID-1-in-containers-exit-with-non-.patch similarity index 100% rename from 1003-main-don-t-freeze-PID-1-in-containers-exit-with-non-.patch rename to 10003-main-don-t-freeze-PID-1-in-containers-exit-with-non-.patch diff --git a/1004-Do-not-go-into-freeze-when-systemd-crashd.patch b/10004-Do-not-go-into-freeze-when-systemd-crashd.patch similarity index 100% rename from 1004-Do-not-go-into-freeze-when-systemd-crashd.patch rename to 10004-Do-not-go-into-freeze-when-systemd-crashd.patch diff --git a/1005-mount-setup-change-the-system-mount-propagation-to-s.patch b/10005-mount-setup-change-the-system-mount-propagation-to-s.patch similarity index 100% rename from 1005-mount-setup-change-the-system-mount-propagation-to-s.patch rename to 10005-mount-setup-change-the-system-mount-propagation-to-s.patch diff --git a/1006-cgroup-util-make-definition-of-CGROUP_CONTROLLER_TO_.patch b/10006-cgroup-util-make-definition-of-CGROUP_CONTROLLER_TO_.patch similarity index 100% rename from 1006-cgroup-util-make-definition-of-CGROUP_CONTROLLER_TO_.patch rename to 10006-cgroup-util-make-definition-of-CGROUP_CONTROLLER_TO_.patch diff --git a/1007-cgroup-update-only-siblings-that-got-realized-once.patch b/10007-cgroup-update-only-siblings-that-got-realized-once.patch similarity index 100% rename from 1007-cgroup-update-only-siblings-that-got-realized-once.patch rename to 10007-cgroup-update-only-siblings-that-got-realized-once.patch diff --git a/1008-core-add-a-config-item-to-support-setting-the-value-.patch b/10008-core-add-a-config-item-to-support-setting-the-value-.patch similarity index 100% rename from 1008-core-add-a-config-item-to-support-setting-the-value-.patch rename to 10008-core-add-a-config-item-to-support-setting-the-value-.patch diff --git a/1009-systemd-anolis-support-loongarch64.patch b/10009-systemd-anolis-support-loongarch64.patch similarity index 100% rename from 1009-systemd-anolis-support-loongarch64.patch rename to 10009-systemd-anolis-support-loongarch64.patch diff --git a/1010-test-catalog-Fix-coredump-when-compiled-under-GCC10.patch b/10010-test-catalog-Fix-coredump-when-compiled-under-GCC10.patch similarity index 100% rename from 1010-test-catalog-Fix-coredump-when-compiled-under-GCC10.patch rename to 10010-test-catalog-Fix-coredump-when-compiled-under-GCC10.patch diff --git a/1011-hwdb-add-Iluvatar-CoreX.patch b/10011-hwdb-add-Iluvatar-CoreX.patch similarity index 100% rename from 1011-hwdb-add-Iluvatar-CoreX.patch rename to 10011-hwdb-add-Iluvatar-CoreX.patch diff --git a/9000-resolved-pin-stream-while-calling-callbacks-for-it.patch b/9000-resolved-pin-stream-while-calling-callbacks-for-it.patch new file mode 100644 index 0000000000000000000000000000000000000000..9b82d08a134fe33b5c1f2c666a2d86b273236b16 --- /dev/null +++ b/9000-resolved-pin-stream-while-calling-callbacks-for-it.patch @@ -0,0 +1,42 @@ +From a4f08c798cabd5c43f2578a9e2b048fa1ad4a52c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 4 Dec 2018 22:13:39 +0100 +Subject: [PATCH] resolved: pin stream while calling callbacks for it + +These callbacks might unref the stream, but we still have to access it, +let's hence ref it explicitly. + +Maybe fixes: #10725 + +(cherry picked from commit d973d94dec349fb676fdd844f6fe2ada3538f27c) + +Resolves: #2110548 +--- + src/resolve/resolved-dns-stream.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c +index 066daef96e..2d0162483a 100644 +--- a/src/resolve/resolved-dns-stream.c ++++ b/src/resolve/resolved-dns-stream.c +@@ -42,6 +42,8 @@ static int dns_stream_update_io(DnsStream *s) { + } + + static int dns_stream_complete(DnsStream *s, int error) { ++ _cleanup_(dns_stream_unrefp) _unused_ DnsStream *ref = dns_stream_ref(s); /* Protect stream while we process it */ ++ + assert(s); + + #if ENABLE_DNS_OVER_TLS +@@ -315,7 +317,7 @@ static int on_stream_timeout(sd_event_source *es, usec_t usec, void *userdata) { + } + + static int on_stream_io(sd_event_source *es, int fd, uint32_t revents, void *userdata) { +- DnsStream *s = userdata; ++ _cleanup_(dns_stream_unrefp) DnsStream *s = dns_stream_ref(userdata); /* Protect stream while we process it */ + int r; + + assert(s); +-- +2.37.1 + diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..0ee7539a2292be885eb3a6caf1a4ee4666e5e99f --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8_6 diff --git a/systemd.spec b/systemd.spec index aaa49bd6f5b300316c93d6a2e03657f7768a5391..45681033262a009a79be6dc21aad8dc88ca9cbf0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -14,7 +14,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 239 -Release: 58%{anolis_release}%{?dist}.3 +Release: 58%{anolis_release}%{?dist}.4 # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -809,18 +809,19 @@ Patch0755: 0755-core-Delay-start-rate-limit-check-when-starting-a-un.patch Patch0756: 0756-core-Propagate-condition-failed-state-to-triggering-.patch Patch0757: 0757-unit-check-for-mount-rate-limiting-before-checking-a.patch -Patch1000: 1000-core-fix-a-null-reference-case-in-load_from_path.patch -Patch1001: 1001-sysctl-Don-t-pass-null-directive-argument-to-s.patch -Patch1002: 1002-exit-status-introduce-EXIT_EXCEPTION-mapping-to-255.patch -Patch1003: 1003-main-don-t-freeze-PID-1-in-containers-exit-with-non-.patch -Patch1004: 1004-Do-not-go-into-freeze-when-systemd-crashd.patch -Patch1005: 1005-mount-setup-change-the-system-mount-propagation-to-s.patch -Patch1006: 1006-cgroup-util-make-definition-of-CGROUP_CONTROLLER_TO_.patch -Patch1007: 1007-cgroup-update-only-siblings-that-got-realized-once.patch -Patch1008: 1008-core-add-a-config-item-to-support-setting-the-value-.patch -Patch1009: 1009-systemd-anolis-support-loongarch64.patch -Patch1010: 1010-test-catalog-Fix-coredump-when-compiled-under-GCC10.patch -Patch1011: 1011-hwdb-add-Iluvatar-CoreX.patch +Patch9000: 9000-resolved-pin-stream-while-calling-callbacks-for-it.patch +Patch10000: 10000-core-fix-a-null-reference-case-in-load_from_path.patch +Patch10001: 10001-sysctl-Don-t-pass-null-directive-argument-to-s.patch +Patch10002: 10002-exit-status-introduce-EXIT_EXCEPTION-mapping-to-255.patch +Patch10003: 10003-main-don-t-freeze-PID-1-in-containers-exit-with-non-.patch +Patch10004: 10004-Do-not-go-into-freeze-when-systemd-crashd.patch +Patch10005: 10005-mount-setup-change-the-system-mount-propagation-to-s.patch +Patch10006: 10006-cgroup-util-make-definition-of-CGROUP_CONTROLLER_TO_.patch +Patch10007: 10007-cgroup-update-only-siblings-that-got-realized-once.patch +Patch10008: 10008-core-add-a-config-item-to-support-setting-the-value-.patch +Patch10009: 10009-systemd-anolis-support-loongarch64.patch +Patch10010: 10010-test-catalog-Fix-coredump-when-compiled-under-GCC10.patch +Patch10011: 10011-hwdb-add-Iluvatar-CoreX.patch %ifarch %{ix86} x86_64 aarch64 %global have_gnu_efi 1 @@ -1450,7 +1451,7 @@ fi %files tests -f .file-list-tests %changelog -* Thu Aug 04 2022 Yuanhong Peng - 239-58.0.3.3 +* Tue Aug 30 2022 Yuanhong Peng - 239-58.0.3.4 - core: fix a null reference case in load_from_path() - sysctl: Don't pass null directive argument to '%s' - exit-status: introduce EXIT_EXCEPTION mapping to 255 @@ -1464,6 +1465,9 @@ fi - test-catalog: Fix coredump when compiled under GCC10 - add Iluvatar CoreX pci id(Liwei Ge) +* Wed Aug 03 2022 systemd maintenance team - 239-58.4 +- resolved: pin stream while calling callbacks for it (#2110548) + * Thu Jun 23 2022 systemd maintenance team - 239-58.3 - unit: check for mount rate limiting before checking active state (#2097336)