From 31dd74cd5208004f81ad59463fa23e17a59ca42f Mon Sep 17 00:00:00 2001 From: Linux_zhang Date: Wed, 2 Apr 2025 17:14:54 +0800 Subject: [PATCH] sync branch patch --- backport-src-useradd-free-string.patch | 27 ++++++++++++++++++++++++++ shadow.spec | 14 ++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 backport-src-useradd-free-string.patch diff --git a/backport-src-useradd-free-string.patch b/backport-src-useradd-free-string.patch new file mode 100644 index 0000000..0fc3cec --- /dev/null +++ b/backport-src-useradd-free-string.patch @@ -0,0 +1,27 @@ +From 92b889b671afb8e77cb9945a97088c6a63130067 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= +Date: Mon, 11 Dec 2023 17:27:44 +0100 +Subject: [PATCH] src/useradd: free string + + useradd.c:2329:10: warning: Potential leak of memory pointed to by 'btrfs_check' [unix.Malloc] + +Reference: https://github.com/shadow-maint/shadow/commit/92b889b671afb8e77cb9945a97088c6a63130067 +Conflict: NA +--- + src/useradd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/useradd.c b/src/useradd.c +index f567d54..2e8725d 100644 +--- a/src/useradd.c ++++ b/src/useradd.c +@@ -2257,6 +2257,7 @@ static void create_home (void) + Prog, path); + fail_exit (E_HOMEDIR); + } ++ free(btrfs_check); + // make subvolume to mount for user instead of directory + if (btrfs_create_subvolume(path)) { + fprintf (stderr, +-- +2.27.0 diff --git a/shadow.spec b/shadow.spec index 9b9209a..4d21f1d 100644 --- a/shadow.spec +++ b/shadow.spec @@ -1,6 +1,6 @@ Name: shadow Version: 4.9 -Release: 16 +Release: 17 Epoch: 2 License: BSD and GPLv2+ Summary: Tools for managing accounts and shadow password files @@ -96,9 +96,10 @@ Patch76: backport-shadow-userdel-add-the-adaptation-to-the-busybox-ps-.patch Patch77: backport-lib-btrfs-avoid-NULL-dereference.patch Patch78: backport-src-passwd.c-Switch-to-day-precision.patch Patch79: backport-src-passwd-add-overflow-check.patch -Patch80: backport-src-useradd.c-get_groups-Fix-memory-leak.patch -Patch81: backport-src-gpasswd-Clear-password-in-more-cases.patch -Patch82: backport-lib-encrypt.c-Do-not-exit-in-error-case.patch +Patch80: backport-src-useradd-free-string.patch +Patch81: backport-src-useradd.c-get_groups-Fix-memory-leak.patch +Patch82: backport-src-gpasswd-Clear-password-in-more-cases.patch +Patch83: backport-lib-encrypt.c-Do-not-exit-in-error-case.patch BuildRequires: gcc, libselinux-devel, audit-libs-devel, libsemanage-devel BuildRequires: libacl-devel, libattr-devel @@ -268,9 +269,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la %{_mandir}/*/* %changelog -* Tue Mar 18 2025 wangjiang - 2:4.9-16 +* Tue Mar 18 2025 wangjiang - 2:4.9-17 - backport patches from upstream +* Sat Mar 16 2024 zhengxiaoxiao - 2:4.9-16 +- backport some patches + * Sun Feb 4 2024 zhengxiaoxiao - 2:4.9-15 - backport some patches -- Gitee