packages/httpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!106 fix CVE-2022-28330

Browse Source 
From: @chengyechun 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-07-21 06:37:23 +00:00 committed by Gitee
commit 4b6ddaf98d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
backport-CVE-2022-28330.patch Normal file
View File

@ -0,0 +1,33 @@
From 258698607821acfda8f90d9d17e44d18c30f8d77 Mon Sep 17 00:00:00 2001
From: covener <covener@apache.org>
Date: Wed, 1 Ju0 2022 12:37:44 UTC
Subject: [PATCH] mod_isapi:use consistent filename
Conflict:NA
Reference:https://github.com/apache/httpd/commit/258698607821acfda8f90d9d17e44d18c30f8d77
---
modules/arch/win32/mod_isapi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 5592a57..a9816e5 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -976,11 +976,11 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
return 0;
}
- len = (apr_uint32_t)strlen(r->filename);
+ len = (apr_uint32_t)strlen(subreq->filename);
if ((subreq->finfo.filetype == APR_DIR)
&& (!subreq->path_info)
- && (file[len - 1] != '/'))
+ && (subreq->filename[len - 1] != '/'))
file = apr_pstrcat(cid->r->pool, subreq->filename, "/", NULL);
else
file = apr_pstrcat(cid->r->pool, subreq->filename,
--
2.23.0

11
httpd.spec
View File

@ -8,7 +8,7 @@
Name: httpd
Summary: Apache HTTP Server
Version: 2.4.51
Release: 6
Release: 7
License: ASL 2.0
URL: https://httpd.apache.org/
Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@ -85,6 +85,7 @@ Patch31: backport-CVE-2022-26377.patch
Patch32: backport-CVE-2022-30522.patch
Patch33: backport-CVE-2022-30556.patch
Patch34: backport-Switch-from-PCRE-to-PCRE2.patch
Patch35: backport-CVE-2022-28330.patch
BuildRequires: gcc autoconf pkgconfig findutils xmlto perl-interpreter perl-generators systemd-devel
BuildRequires: zlib-devel libselinux-devel lua-devel brotli-devel
@ -517,7 +518,13 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Sat Jun 25 2022 seuzw <930zhaowei@163.com> - 2.4.51-6
* Thu Jul 21 2022 chengyechun <chengyechun1@huawei.com> - 2.4.51-7
- Type:CVE
- ID:CVE-2022-28330
- SUG:restart
- DESC:fix CVE-2022-28330
* Sat Jun 25 2022 seuzw <930zhaowei@163.com> - 2.4.51-5
- Type:bugfix
- ID:NA
- SUG:restart