From d734f447e133ad7b3e81ae4335918d7bb26da64f Mon Sep 17 00:00:00 2001 From: xuraoqing Date: Tue, 19 Sep 2023 14:02:09 +0800 Subject: [PATCH] backport patches Signed-off-by: xuraoqing (cherry picked from commit 5340064e1681d217a1773f5accb0eb93cc53c71d) --- ...propd-crash-with-unrecognized-option.patch | 28 +++++++++++++++++++ krb5.spec | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 backport-Fix-kpropd-crash-with-unrecognized-option.patch diff --git a/backport-Fix-kpropd-crash-with-unrecognized-option.patch b/backport-Fix-kpropd-crash-with-unrecognized-option.patch new file mode 100644 index 0000000..53b5b6c --- /dev/null +++ b/backport-Fix-kpropd-crash-with-unrecognized-option.patch @@ -0,0 +1,28 @@ +From d0ea8de883a2487dfde8bfa377b64df1194ed5cb Mon Sep 17 00:00:00 2001 +From: abushwang +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(¶ms, 0, sizeof(params)); +-- +2.27.0 + diff --git a/krb5.spec b/krb5.spec index 675bd0b..cee9c33 100644 --- a/krb5.spec +++ b/krb5.spec @@ -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 - 1.19.2-10 +- backport patches + * Tue Aug 15 2023 liningjie - 1.19.2-9 - fix CVE-2023-36054 -- Gitee