backport some patches

(cherry picked from commit dab008ef9821e09dc971f680a51f3ffb3fb27551)
This commit is contained in:
zhengxiaoxiao 2024-03-16 17:32:55 +08:00 committed by openeuler-sync-bot
parent 2cf2b96a69
commit d5ae00b4b9
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 92b889b671afb8e77cb9945a97088c6a63130067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
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

View File

@ -1,6 +1,6 @@
Name: shadow Name: shadow
Version: 4.9 Version: 4.9
Release: 15 Release: 16
Epoch: 2 Epoch: 2
License: BSD and GPLv2+ License: BSD and GPLv2+
Summary: Tools for managing accounts and shadow password files Summary: Tools for managing accounts and shadow password files
@ -96,6 +96,7 @@ Patch76: backport-shadow-userdel-add-the-adaptation-to-the-busybox-ps-.patch
Patch77: backport-lib-btrfs-avoid-NULL-dereference.patch Patch77: backport-lib-btrfs-avoid-NULL-dereference.patch
Patch78: backport-src-passwd.c-Switch-to-day-precision.patch Patch78: backport-src-passwd.c-Switch-to-day-precision.patch
Patch79: backport-src-passwd-add-overflow-check.patch Patch79: backport-src-passwd-add-overflow-check.patch
Patch80: backport-src-useradd-free-string.patch
BuildRequires: gcc, libselinux-devel, audit-libs-devel, libsemanage-devel BuildRequires: gcc, libselinux-devel, audit-libs-devel, libsemanage-devel
BuildRequires: libacl-devel, libattr-devel BuildRequires: libacl-devel, libattr-devel
@ -265,6 +266,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Sat Mar 16 2024 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 2:4.9-16
- backport some patches
* Sun Feb 4 2024 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 2:4.9-15 * Sun Feb 4 2024 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 2:4.9-15
- backport some patches - backport some patches