forked from pool/systemd
fed1c9a7ac
- Added patches to fix CVE-2021-33910 (bsc#1188063) Added 1001-unit-name-generate-a-clear-error-code-when-convertin.patch Added 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch Added 1003-basic-unit-name-adjust-comments.patch These patches will be moved to the git repo once the bug will become public. - systemd-hwdb-update.service should be shipped by the udev package OBS-URL: https://build.opensuse.org/request/show/907311 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=332
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
From 9731d5204357d43204ca83155f5b552594b843bc 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 11:52:56 +0200
|
|
Subject: [PATCH 1003/1003] basic/unit-name: adjust comments
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We already checked for "too long" right above…
|
|
---
|
|
src/basic/unit-name.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
|
|
index 46b24f2d9e..c5850949ae 100644
|
|
--- a/src/basic/unit-name.c
|
|
+++ b/src/basic/unit-name.c
|
|
@@ -528,7 +528,7 @@ int unit_name_from_path(const char *path, const char *suffix, char **ret) {
|
|
if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */
|
|
return -ENAMETOOLONG;
|
|
|
|
- /* Refuse this if this got too long or for some other reason didn't result in a valid name */
|
|
+ /* Refuse if this for some other reason didn't result in a valid name */
|
|
if (!unit_name_is_valid(s, UNIT_NAME_PLAIN))
|
|
return -EINVAL;
|
|
|
|
@@ -562,7 +562,7 @@ int unit_name_from_path_instance(const char *prefix, const char *path, const cha
|
|
if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */
|
|
return -ENAMETOOLONG;
|
|
|
|
- /* Refuse this if this got too long or for some other reason didn't result in a valid name */
|
|
+ /* Refuse if this for some other reason didn't result in a valid name */
|
|
if (!unit_name_is_valid(s, UNIT_NAME_INSTANCE))
|
|
return -EINVAL;
|
|
|
|
--
|
|
2.26.2
|
|
|