mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Changqing Li
8238504903
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
From 7199ebc203f74fd9e44595474de6bdc41740c5cf Mon Sep 17 00:00:00 2001
|
|
From: Maxim Dounin <mdounin@mdounin.ru>
|
|
Date: Tue, 25 May 2021 15:17:36 +0300
|
|
Subject: [PATCH] Resolver: fixed off-by-one write in ngx_resolver_copy().
|
|
|
|
Reported by Luis Merino, Markus Vervier, Eric Sesterhenn, X41 D-Sec GmbH.
|
|
|
|
Upstream-Status: Backport
|
|
CVE: CVE-2021-23017
|
|
|
|
Reference to upstream patch:
|
|
https://github.com/nginx/nginx/commit/7199ebc203f74fd9e44595474de6bdc41740c5cf
|
|
|
|
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
---
|
|
src/core/ngx_resolver.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
|
|
index 79390701..63b26193 100644
|
|
--- a/src/core/ngx_resolver.c
|
|
+++ b/src/core/ngx_resolver.c
|
|
@@ -4008,15 +4008,15 @@ done:
|
|
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) {
|
|
--
|
|
2.17.1
|
|
|