From e00a7f1c8a2afb7b70c89cd5cd58e78ca5c23e3d Mon Sep 17 00:00:00 2001
From: starlet-dx <15929766099@163.com>
Date: Tue, 28 Jun 2022 16:37:28 +0800
Subject: [PATCH] Fix CVE-2022-23094

---
 CVE-2022-23094.patch | 26 ++++++++++++++++++++++++++
 libreswan.spec       |  9 +++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 CVE-2022-23094.patch

diff --git a/CVE-2022-23094.patch b/CVE-2022-23094.patch
new file mode 100644
index 0000000..8ad5e67
--- /dev/null
+++ b/CVE-2022-23094.patch
@@ -0,0 +1,26 @@
+diff --git a/programs/pluto/ikev1.c b/programs/pluto/ikev1.c
+index 9f4847874d..f7413f3594 100644
+--- a/programs/pluto/ikev1.c
++++ b/programs/pluto/ikev1.c
+@@ -2103,7 +2103,9 @@ void process_packet_tail(struct msg_digest *md)
+ 					diag_t d = pbs_in_struct(&md->message_pbs, &isakmp_ignore_desc,
+ 								 &pd->payload, sizeof(pd->payload), &pd->pbs);
+ 					if (d != NULL) {
+-						llog_diag(RC_LOG, st->st_logger, &d, "%s", "");
++						llog_diag(RC_LOG,
++							st != NULL ? st->st_logger : md->md_logger,
++							&d, "%s", "");
+ 						LOG_PACKET(RC_LOG_SERIOUS,
+ 							   "%smalformed payload in packet",
+ 							   excuse);
+@@ -2172,7 +2174,9 @@ void process_packet_tail(struct msg_digest *md)
+ 						 &pd->payload, sizeof(pd->payload),
+ 						 &pd->pbs);
+ 			if (d != NULL) {
+-				llog_diag(RC_LOG, st->st_logger, &d, "%s", "");
++				llog_diag(RC_LOG,
++					st != NULL ? st->st_logger : md->md_logger,
++					&d, "%s", "");
+ 				LOG_PACKET(RC_LOG_SERIOUS,
+ 					   "%smalformed payload in packet",
+ 					   excuse);
diff --git a/libreswan.spec b/libreswan.spec
index 922180b..fd31d70 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -26,7 +26,7 @@
 Name: libreswan
 Summary: IKE implementation for IPsec with IKEv1 and IKEv2 support
 Version: 4.5
-Release: 1
+Release: 2
 License: GPLv2
 Url: https://libreswan.org/
 Source0: https://download.libreswan.org/%{name}-%{version}.tar.gz
@@ -34,6 +34,8 @@ Source1: https://download.libreswan.org/cavs/ikev1_dsa.fax.bz2
 Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2
 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2
 Source4: openeuler-libreswan-sysctl.conf
+#https://libreswan.org/security/CVE-2022-23094/
+Patch0:  CVE-2022-23094.patch
 
 BuildRequires: audit-libs-devel
 BuildRequires: bison
@@ -91,7 +93,7 @@ Summary:    Help documents for libreswan
 Man pages and other related help documents for libreswan.
 
 %prep
-%setup -q -n libreswan-%{version}%{?prever}
+%autosetup -n libreswan-%{version}%{?prever} -p1
 
 sed -i "s/-lfreebl //" mk/config.mk
 
@@ -187,6 +189,9 @@ certutil -N -d sql:$tmpdir --empty-password
 %attr(0644,root,root) %doc %{_mandir}/*/*
 
 %changelog
+* Tue Jun 28 2022 yaoxin <yaoxin30@h-partners.com> - 4.5-2
+- Fix CVE-2022-23094
+
 * Wed Jan 12 2022 caodongxia <caodongxia@huawei.com> - 4.5-1
 - Update to 4.5
 
-- 
Gitee