Fix CVE-2022-34903
Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
This commit is contained in:
parent
173ea7a19c
commit
84d5794702
50
backport-CVE-2022-34903.patch
Normal file
50
backport-CVE-2022-34903.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001
|
||||
From: Werner Koch <wk@gnupg.org>
|
||||
Date: Tue, 14 Jun 2022 11:33:27 +0200
|
||||
Subject: [PATCH] g10: Fix garbled status messages in NOTATION_DATA
|
||||
|
||||
* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
|
||||
--
|
||||
|
||||
Depending on the escaping and line wrapping the computed remaining
|
||||
buffer length could be wrong. Fixed by always using a break to
|
||||
terminate the escape detection loop. Might have happened for all
|
||||
status lines which may wrap.
|
||||
|
||||
GnuPG-bug-id: T6027
|
||||
---
|
||||
g10/cpr.c | 13 ++++---------
|
||||
1 file changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/g10/cpr.c b/g10/cpr.c
|
||||
index 9bfdd3c34..fa8005d6f 100644
|
||||
--- a/g10/cpr.c
|
||||
+++ b/g10/cpr.c
|
||||
@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
|
||||
}
|
||||
first = 0;
|
||||
}
|
||||
- for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
|
||||
+ for (esc=0, s=buffer, n=len; n; s++, n--)
|
||||
{
|
||||
if (*s == '%' || *(const byte*)s <= lower_limit
|
||||
|| *(const byte*)s == 127 )
|
||||
esc = 1;
|
||||
if (wrap && ++count > wrap)
|
||||
- {
|
||||
- dowrap=1;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- if (esc)
|
||||
- {
|
||||
- s--; n++;
|
||||
+ dowrap=1;
|
||||
+ if (esc || dowrap)
|
||||
+ break;
|
||||
}
|
||||
if (s != buffer)
|
||||
es_fwrite (buffer, s-buffer, 1, statusfp);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: gnupg2
|
||||
Version: 2.2.32
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Utility for secure communication and data storage
|
||||
|
||||
License: GPLv3+
|
||||
@ -20,6 +20,7 @@ Patch8: gnupg-2.2.18-tests-add-test-cases-for-import-without-uid.patch
|
||||
Patch9: gnupg-2.2.20-file-is-digest.patch
|
||||
Patch10: gnupg-2.2.21-coverity.patch
|
||||
Patch11: common-Avoid-undefined-behavior-of-left-shift-operat.patch
|
||||
Patch12: backport-CVE-2022-34903.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: zlib-devel, npth-devel, texinfo
|
||||
@ -115,6 +116,9 @@ make check
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 15 2022 yixiangzhike <yixiangzhike007@163.com> - 2.2.32-3
|
||||
- fix CVE-2022-34903
|
||||
|
||||
* Mon Jun 27 2022 yixiangzhike <yixiangzhike007@163.com> - 2.2.32-2
|
||||
- need require new version libgpg-error(1.41) and libgcrypt(1.9.4)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user