!62 backport some patches from upstream
From: @chengyechun Reviewed-by: @kircher Signed-off-by: @kircher
This commit is contained in:
commit
f6d32aeb3f
@ -0,0 +1,37 @@
|
|||||||
|
From 6f92672308e9ff2ff72f1d929b6887ab24787e42 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Harlen Stenn <stenn@ntp.org>
|
||||||
|
Date: Tue, 20 Jun 2023 18:41:55 +0000
|
||||||
|
Subject: [PATCH] add NULL pointer check when ntpd deletes the last interface
|
||||||
|
|
||||||
|
Conflict:NA
|
||||||
|
Reference:https://bugs.ntp.org/attachment.cgi?id=1854&action=diff
|
||||||
|
|
||||||
|
---
|
||||||
|
include/ntp_lists.h | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/ntp_lists.h b/include/ntp_lists.h
|
||||||
|
index d741974..37befc0 100644
|
||||||
|
--- a/include/ntp_lists.h
|
||||||
|
+++ b/include/ntp_lists.h
|
||||||
|
@@ -181,7 +181,7 @@ do { \
|
||||||
|
|
||||||
|
#define UNLINK_EXPR_SLIST(punlinked, listhead, expr, nextlink, \
|
||||||
|
entrytype) \
|
||||||
|
-do { \
|
||||||
|
+if (NULL != (listhead)) { \
|
||||||
|
entrytype **ppentry; \
|
||||||
|
\
|
||||||
|
ppentry = &(listhead); \
|
||||||
|
@@ -202,6 +202,8 @@ do { \
|
||||||
|
} else { \
|
||||||
|
(punlinked) = NULL; \
|
||||||
|
} \
|
||||||
|
+} else do { \
|
||||||
|
+ (punlinked) = NULL; \
|
||||||
|
} while (FALSE)
|
||||||
|
|
||||||
|
#define UNLINK_SLIST(punlinked, listhead, ptounlink, nextlink, \
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
9
ntp.spec
9
ntp.spec
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: ntp
|
Name: ntp
|
||||||
Version: 4.2.8p15
|
Version: 4.2.8p15
|
||||||
Release: 10
|
Release: 11
|
||||||
Summary: A protocol designed to synchronize the clocks of computers over a network
|
Summary: A protocol designed to synchronize the clocks of computers over a network
|
||||||
License: MIT and BSD and BSD with advertising
|
License: MIT and BSD and BSD with advertising
|
||||||
URL: https://www.ntp.org/
|
URL: https://www.ntp.org/
|
||||||
@ -29,6 +29,7 @@ Patch6: fix-MD5-manpage.patch
|
|||||||
Patch7: modify-DSA-key-generation-parameters-base-on-openssl3.patch
|
Patch7: modify-DSA-key-generation-parameters-base-on-openssl3.patch
|
||||||
Patch8: backport-CVE-2023-26551-CVE-2023-26552-CVE-2023-26553-CVE-2023-26554.patch
|
Patch8: backport-CVE-2023-26551-CVE-2023-26552-CVE-2023-26553-CVE-2023-26554.patch
|
||||||
Patch9: backport-CVE-2023-26555-fix-out-write-bounds-in-praecis_parse.patch
|
Patch9: backport-CVE-2023-26555-fix-out-write-bounds-in-praecis_parse.patch
|
||||||
|
Patch10: backport-add-NULL-pointer-check-when-ntpd-deletes-the-last-interface.patch
|
||||||
|
|
||||||
BuildRequires: libcap-devel openssl-devel libedit-devel libevent-devel pps-tools-devel
|
BuildRequires: libcap-devel openssl-devel libedit-devel libevent-devel pps-tools-devel
|
||||||
BuildRequires: autogen autogen-libopts-devel systemd gcc perl-generators perl-HTML-Parser
|
BuildRequires: autogen autogen-libopts-devel systemd gcc perl-generators perl-HTML-Parser
|
||||||
@ -211,6 +212,12 @@ make check
|
|||||||
%{_mandir}/man8/*.8*
|
%{_mandir}/man8/*.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 21 2023 chengyechun <chengyechun1@huawei.com> - 4.2.8p15-11
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:add NULL pointer check when ntpd deletes the last interface
|
||||||
|
|
||||||
* Wed May 24 2023 chengyechun <chengyechun1@huawei.com> - 4.2.8p15-10
|
* Wed May 24 2023 chengyechun <chengyechun1@huawei.com> - 4.2.8p15-10
|
||||||
- Type:CVE
|
- Type:CVE
|
||||||
- ID:CVE-2023-26551,CVE-2023-26552,CVE-2023-26553,CVE-2023-26554,CVE-2023-26555
|
- ID:CVE-2023-26551,CVE-2023-26552,CVE-2023-26553,CVE-2023-26554,CVE-2023-26555
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user