backport patches

Signed-off-by: xuraoqing <xuraoqing@huawei.com>
(cherry picked from commit 5340064e1681d217a1773f5accb0eb93cc53c71d)
This commit is contained in:
xuraoqing 2023-09-19 14:02:09 +08:00 committed by openeuler-sync-bot
parent 7b8cb1052d
commit d734f447e1
2 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,28 @@
From d0ea8de883a2487dfde8bfa377b64df1194ed5cb Mon Sep 17 00:00:00 2001
From: abushwang <wangshuo_1994@foxmail.com>
Date: Wed, 28 Dec 2022 15:06:02 +0800
Subject: [PATCH] Fix kpropd crash with unrecognized option
ticket: 9083 (new)
tags: pullup
target_version: 1.20-next
target_version: 1.19-next
---
src/kprop/kpropd.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c
index f2341d720..aa3c81ea3 100644
--- a/src/kprop/kpropd.c
+++ b/src/kprop/kpropd.c
@@ -1047,6 +1047,7 @@ parse_args(int argc, char **argv)
enum { PID_FILE = 256 };
struct option long_options[] = {
{ "pid-file", 1, NULL, PID_FILE },
+ { NULL, 0, NULL, 0 },
};
memset(&params, 0, sizeof(params));
--
2.27.0

View File

@ -36,6 +36,7 @@ Patch12: backport-Fix-many-unlikely-memory-leaks.patch
Patch13: backport-Free-verto-context-later-in-KDC-cleanup.patch
Patch14: backport-Squash-unused-variable-warnings-in-kdb5_ldap_util.patch
Patch15: CVE-2023-36054.patch
Patch16: backport-Fix-kpropd-crash-with-unrecognized-option.patch
BuildRequires: gettext
BuildRequires: gcc make automake autoconf pkgconfig pam-devel libselinux-devel byacc
@ -328,6 +329,9 @@ make -C src check || :
%changelog
* Tue Sep 19 2023 xuraoqing <xuraoqing@huawei.com> - 1.19.2-10
- backport patches
* Tue Aug 15 2023 liningjie <liningjie@xfusion.com> - 1.19.2-9
- fix CVE-2023-36054