fix cve 2021 23017

This commit is contained in:
Xinwei Hu 2023-07-29 10:00:35 +08:00
parent c5673d6641
commit 0451720d79
2 changed files with 29 additions and 1 deletions

23
fix-cve-2021-23017.patch Normal file
View File

@ -0,0 +1,23 @@
--- bundle/nginx-1.19.3/src/core/ngx_resolver.c.orig 2023-07-29 09:46:00.929124573 +0800
+++ bundle/nginx-1.19.3/src/core/ngx_resolver.c 2023-07-29 09:47:34.318660989 +0800
@@ -4232,15 +4232,16 @@
n = *src++;
} else {
+
+ if (dst != name->data) {
+ *dst++ = '.';
+ }
+
ngx_strlow(dst, src, n);
dst += n;
src += n;
n = *src++;
-
- if (n != 0) {
- *dst++ = '.';
- }
}
if (n == 0) {

View File

@ -1,6 +1,6 @@
Name: openresty
Version: 1.19.3.1
Release: 2
Release: 3
Summary: OpenResty, scalable web platform by extending NGINX with Lua
Group: System Environment/Daemons
@ -20,6 +20,7 @@ Source1: openresty.service
Source2: openresty.init
Patch1: 0001-add-option-out-dir-on-configure.patch
Patch2: fix-cve-2021-23017.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -225,6 +226,7 @@ a single box.
%setup -q -n "openresty-%{version}"
%patch1 -p1
%patch2
%build
./configure \
@ -443,6 +445,9 @@ fi
%{orprefix_debug}/COPYRIGHT
%changelog
* Sat Jul 29 2023 Xinwei Hu <shinwell_hu@openeuler.sh> - 1.19.3.1-3
- Fix CVE 2021-23017 for nginx
* Thu Mar 24 2022 Ge Wang <wangge20@huawei.com> 1.19.3.1-2
- Modify release number