diff options
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/CVE-2022-34903.patch')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/CVE-2022-34903.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/CVE-2022-34903.patch b/meta/recipes-support/gnupg/gnupg/CVE-2022-34903.patch new file mode 100644 index 0000000000..5992949d35 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/CVE-2022-34903.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 2f05fc96b1332caf97176841b1152da3f0aa16a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hitendra Prajapati <hprajapati@mvista.com> | ||
3 | Date: Fri, 22 Jul 2022 17:52:36 +0530 | ||
4 | Subject: [PATCH] CVE-2022-34903 | ||
5 | |||
6 | Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=34c649b3601383cd11dbc76221747ec16fd68e1b] | ||
7 | CVE: CVE-2022-34903 | ||
8 | Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> | ||
9 | --- | ||
10 | g10/cpr.c | 13 ++++--------- | ||
11 | 1 file changed, 4 insertions(+), 9 deletions(-) | ||
12 | |||
13 | diff --git a/g10/cpr.c b/g10/cpr.c | ||
14 | index d502e8b..bc4b715 100644 | ||
15 | --- a/g10/cpr.c | ||
16 | +++ b/g10/cpr.c | ||
17 | @@ -328,20 +328,15 @@ write_status_text_and_buffer (int no, const char *string, | ||
18 | } | ||
19 | first = 0; | ||
20 | } | ||
21 | - for (esc=0, s=buffer, n=len; n && !esc; s++, n--) | ||
22 | + for (esc=0, s=buffer, n=len; n; s++, n--) | ||
23 | { | ||
24 | if (*s == '%' || *(const byte*)s <= lower_limit | ||
25 | || *(const byte*)s == 127 ) | ||
26 | esc = 1; | ||
27 | if (wrap && ++count > wrap) | ||
28 | - { | ||
29 | - dowrap=1; | ||
30 | - break; | ||
31 | - } | ||
32 | - } | ||
33 | - if (esc) | ||
34 | - { | ||
35 | - s--; n++; | ||
36 | + dowrap=1; | ||
37 | + if (esc || dowrap) | ||
38 | + break; | ||
39 | } | ||
40 | if (s != buffer) | ||
41 | es_fwrite (buffer, s-buffer, 1, statusfp); | ||
42 | -- | ||
43 | 2.25.1 | ||
44 | |||