public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] time: Fix use-after-free in getdate
@ 2023-06-06 19:18 Arjun Shankar
  0 siblings, 0 replies; only message in thread
From: Arjun Shankar @ 2023-06-06 19:18 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=85e6d8b4175fcb195011a0a1bad37d6f3b2355db

commit 85e6d8b4175fcb195011a0a1bad37d6f3b2355db
Author: Arjun Shankar <arjun@redhat.com>
Date:   Tue Jun 6 19:20:31 2023 +0200

    time: Fix use-after-free in getdate
    
    getdate would free the buffer pointed to by the result of its call to
    strptime, then reference the same buffer later on -- leading to a
    use-after-free.  This commit fixes that.
    
    Reported-by: Martin Coufal <mcoufal@redhat.com>
    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

Diff:
---
 time/getdate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/time/getdate.c b/time/getdate.c
index 1dcbd77188..ca058394a3 100644
--- a/time/getdate.c
+++ b/time/getdate.c
@@ -114,6 +114,7 @@ __getdate_r (const char *string, struct tm *tp)
   struct tm tm;
   struct __stat64_t64 st;
   bool mday_ok = false;
+  bool found = false;
 
   datemsk = getenv ("DATEMSK");
   if (datemsk == NULL || *datemsk == '\0')
@@ -181,7 +182,7 @@ __getdate_r (const char *string, struct tm *tp)
       tp->tm_gmtoff = 0;
       tp->tm_zone = NULL;
       result = strptime (string, line, tp);
-      if (result && *result == '\0')
+      if ((found = (result && *result == '\0')))
 	break;
     }
   while (!__feof_unlocked (fp));
@@ -201,7 +202,7 @@ __getdate_r (const char *string, struct tm *tp)
   /* Close template file.  */
   fclose (fp);
 
-  if (result == NULL || *result != '\0')
+  if (!found)
     return 7;
 
   /* Get current time.  */

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-06-06 19:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-06 19:18 [glibc] time: Fix use-after-free in getdate Arjun Shankar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).