From 2e5f146774f64a935c02f653d7cd7573daf40cfa Mon Sep 17 00:00:00 2001
From: h30032433 <huyubiao@huawei.com>
Date: Mon, 29 Apr 2024 16:00:53 +0800
Subject: [PATCH] sync patches from systemd community

---
 ...me-dir-properly-check-for-mount-poin.patch | 32 +++++++++++++++++++
 ...t-user-util-validate-the-right-field.patch | 32 +++++++++++++++++++
 systemd.spec                                  |  8 ++++-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
 create mode 100644 backport-user-util-validate-the-right-field.patch

diff --git a/backport-login-user-runtime-dir-properly-check-for-mount-poin.patch b/backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
new file mode 100644
index 0000000..474737a
--- /dev/null
+++ b/backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
@@ -0,0 +1,32 @@
+From 4c3e455c093c274e3ccbc4662e47a72c3f43a34d Mon Sep 17 00:00:00 2001
+From: Mike Yuan <me@yhndnzj.com>
+Date: Mon, 5 Feb 2024 04:53:14 +0800
+Subject: [PATCH] login/user-runtime-dir: properly check for mount point
+
+(cherry picked from commit 561d8793058bba886d71f96fa157ca77cd6b5c23)
+(cherry picked from commit 0ec2d29241b9d5d77630ba5ad7fa1cf4f632e1f6)
+(cherry picked from commit ad9eafcc8264976b762efe4d0ce70f924d2be0bc)
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd-stable/commit/4c3e455c093c274e3ccbc4662e47a72c3f43a34d
+
+---
+ src/login/user-runtime-dir.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
+index f96a2d8662..c74d8b8d0e 100644
+--- a/src/login/user-runtime-dir.c
++++ b/src/login/user-runtime-dir.c
+@@ -66,7 +66,7 @@ static int user_mkdir_runtime_path(
+         if (r < 0)
+                 return log_error_errno(r, "Failed to create /run/user: %m");
+ 
+-        if (path_is_mount_point(runtime_path, NULL, 0) >= 0)
++        if (path_is_mount_point(runtime_path, NULL, 0) > 0)
+                 log_debug("%s is already a mount point", runtime_path);
+         else {
+                 char options[sizeof("mode=0700,uid=,gid=,size=,nr_inodes=,smackfsroot=*")
+-- 
+2.33.0
+
diff --git a/backport-user-util-validate-the-right-field.patch b/backport-user-util-validate-the-right-field.patch
new file mode 100644
index 0000000..250212a
--- /dev/null
+++ b/backport-user-util-validate-the-right-field.patch
@@ -0,0 +1,32 @@
+From 3db209c9567c728c13b5d901e81f151ed1d2b0f7 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 19 Jan 2024 11:32:26 +0100
+Subject: [PATCH] user-util: validate the right field
+
+(cherry picked from commit 829854afa5e38db30be207fc8f8f80705e623795)
+(cherry picked from commit 624984ff423a98f1fd66e64ddfe3a8972d2f911f)
+(cherry picked from commit 641b8d700694984e40199008b059a65184dc946b)
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd-stable/commit/3db209c9567c728c13b5d901e81f151ed1d2b0f7
+
+---
+ src/basic/user-util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/user-util.c b/src/basic/user-util.c
+index 519ab70118..c81d19409d 100644
+--- a/src/basic/user-util.c
++++ b/src/basic/user-util.c
+@@ -314,7 +314,7 @@ int get_user_creds(
+         if (shell) {
+                 if (FLAGS_SET(flags, USER_CREDS_CLEAN) &&
+                     (isempty(p->pw_shell) ||
+-                     !path_is_valid(p->pw_dir) ||
++                     !path_is_valid(p->pw_shell) ||
+                      !path_is_absolute(p->pw_shell) ||
+                      is_nologin_shell(p->pw_shell)))
+                         *shell = NULL;
+-- 
+2.33.0
+
diff --git a/systemd.spec b/systemd.spec
index ce99325..bf5f389 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,7 +21,7 @@
 Name:           systemd
 Url:            https://systemd.io/
 Version:        249
-Release:        77
+Release:        78
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -640,6 +640,8 @@ Patch6591:      backport-shutdown-get-only-active-md-arrays.patch
 Patch6592:      backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch
 Patch6593:      backport-CVE-2023-50387.patch
 Patch6594:      backport-CVE-2023-50868.patch
+Patch6595:      backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
+Patch6596:      backport-user-util-validate-the-right-field.patch
 
 Patch9001:      update-rtc-with-system-clock-when-shutdown.patch
 Patch9002:      udev-add-actions-while-rename-netif-failed.patch
@@ -2144,6 +2146,10 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null &&
 %{_libdir}/security/pam_systemd.so
 
 %changelog
+* Mon Apr 29 2024 huyubiao <huyubiao@huawei.com> - 249-78
+- add backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
+      backport-user-util-validate-the-right-field.patch
+
 * Wed Apr 17 2024 huyubiao <huyubiao@huawei.com> - 249-77
 - fix CVE-2023-50387 and CVE-2023-50868