File gnupg-CVE-2022-34903.patch of Package gpg2.25113

Overview Repositories Revisions Requests Users Attributes Meta

File gnupg-CVE-2022-34903.patch of Package gpg2.25113

From: Werner Koch <wk@gnupg.org>
Date: Tue, 14 Jun 2022 11:33:27 +0200
Subject: 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
(cherry picked from commit 34c649b3601383cd11dbc76221747ec16fd68e1b)
---
 g10/cpr.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Index: gnupg-2.0.24/g10/cpr.c
===================================================================
--- gnupg-2.0.24.orig/g10/cpr.c
+++ gnupg-2.0.24/g10/cpr.c
@@ -233,17 +233,14 @@ write_status_text_and_buffer ( int no, c
             }
             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++;
+            if ( wrap && ++count > wrap ) 
+              dowrap=1;
+            if (esc || dowrap)
+              break;
         }
         if (s != buffer)
             fwrite (buffer, s-buffer, 1, statusfp );

Places

File gnupg-CVE-2022-34903.patch of Package gpg2.25113

Places