packages/systemd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport patchs to fix issues

Browse Source
This commit is contained in:
yangmingtaip 2022-01-26 17:38:26 +08:00
parent bb60d78541
commit 5df72320d1
4 changed files with 115 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
backport-cgroup-Also-set-blkio.bfq.weight.patch Normal file
View File

@ -0,0 +1,34 @@
From 35e7a62ca32a30169a94693b831e53c832251984 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 25 Nov 2020 09:05:36 +0100
Subject: [PATCH] cgroup: Also set blkio.bfq.weight
Commit [1] added a workaround when unified cgroups are used but missed
legacy cgroups where there is the same issue.
[1] <https://github.com/systemd/systemd/commit/2dbc45aea747f25cc1c3848fded2ec0062f96bcf>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
src/core/cgroup.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index b9d84dcca9..fe7c80fdbc 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1244,6 +1244,11 @@ static void cgroup_context_apply(
xsprintf(buf, "%" PRIu64 "\n", weight);
(void) set_attribute_and_warn(u, "blkio", "blkio.weight", buf);
+ /* FIXME: drop this when distro kernels properly support BFQ through "blkio.weight"
+ * See also: https://github.com/systemd/systemd/pull/13335 */
+ xsprintf(buf, "%" PRIu64 "\n", weight);
+ (void) set_attribute_and_warn(u, "blkio", "blkio.bfq.weight", buf);
+
if (has_io) {
CGroupIODeviceWeight *w;
--
2.27.0

33
backport-dbus-socket-fix-check-of-Listen-arguments.patch Normal file
View File

@ -0,0 +1,33 @@
From aeecab3804aae973577f36880af4b7799e4eb7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 23 Jun 2021 18:10:57 +0200
Subject: [PATCH] dbus-socket: fix check of Listen* arguments
We checked the wrong field, which was always NULL here, so we would always
reject the assignment. We would also print the wrong string in the error
message:
$ sudo systemd-run --socket-property ListenFIFO=/tmp/fifo3 cat
Failed to start transient socket unit: Invalid socket path: FIFO
---
src/core/dbus-socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 61c2f1a199..f45a5c16eb 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -383,8 +383,8 @@ static int bus_socket_set_transient_property(
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown Socket type: %s", t);
if (p->type != SOCKET_SOCKET) {
- if (!path_is_valid(p->path))
- return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid socket path: %s", t);
+ if (!path_is_valid(a))
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid socket path: %s", a);
p->path = strdup(a);
if (!p->path)
--
2.27.0

39
backport-udevadm-fix-tag-match-help-description.patch Normal file
View File

@ -0,0 +1,39 @@
From d27e6aee5050da17bc9531fb62ac11aba4b15ceb Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 7 Jun 2021 16:08:45 +0200
Subject: [PATCH] udevadm: fix --tag-match help + description
---
man/udevadm.xml | 2 +-
src/udev/udevadm-trigger.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/udevadm.xml b/man/udevadm.xml
index 531a88d8a3..90adc64543 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -332,7 +332,7 @@
</varlistentry>
<varlistentry>
<term><option>-g</option></term>
- <term><option>--tag-match=<replaceable>PROPERTY</replaceable></option></term>
+ <term><option>--tag-match=<replaceable>TAG</replaceable></option></term>
<listitem>
<para>Trigger events for devices with a matching tag. When this option is specified multiple times,
then each matching result is ANDed, that is, devices which have all specified tags are triggered.</para>
diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index dc68f38d03..984ec1b84b 100644
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -222,7 +222,7 @@ static int help(void) {
" -a --attr-match=FILE[=VALUE] Trigger devices with a matching attribute\n"
" -A --attr-nomatch=FILE[=VALUE] Exclude devices with a matching attribute\n"
" -p --property-match=KEY=VALUE Trigger devices with a matching property\n"
- " -g --tag-match=KEY=VALUE Trigger devices with a matching property\n"
+ " -g --tag-match=TAG Trigger devices with a matching tag\n"
" -y --sysname-match=NAME Trigger devices with this /sys path\n"
" --name-match=NAME Trigger devices with this /dev name\n"
" -b --parent-match=NAME Trigger devices with that parent device\n"
--
2.27.0

10
systemd.spec
View File

@ -16,7 +16,7 @@
Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 243
Release: 51
Release: 52
License: MIT and LGPLv2+ and GPLv2+
Summary: System and Service Manager
@ -150,6 +150,9 @@ Patch0102: backport-0006-CVE-2021-3997-tmpfiles-st-may-have-been-used-unini
Patch0103: backport-0007-CVE-2021-3997-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch
Patch0104: backport-0008-CVE-2021-3997-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch
Patch0105: backport-0009-CVE-2021-3997-shared-rm-rf-loop-over-nested-directories-instead-of.patch
Patch0106: backport-cgroup-Also-set-blkio.bfq.weight.patch
Patch0107: backport-dbus-socket-fix-check-of-Listen-arguments.patch
Patch0108: backport-udevadm-fix-tag-match-help-description.patch
#openEuler
Patch9002: 1509-fix-journal-file-descriptors-leak-problems.patch
@ -1538,6 +1541,11 @@ fi
%exclude /usr/share/man/man3/*
%changelog
* Wed Jan 26 2021 yangmingtai <yangmingtai@huawei.com> - 243-52
- fix some issue: 1.fix set blkio.bfq.weight
2.udevadm fix --tag-match
3.fix check of Listen* arguments
* Tue Jan 18 2021 yangmingtai <yangmingtai@huawei.com> - 243-51
- CVE:fix CVE-2021-3997