about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2024-05-02 17:06:19 +0200
committerFlorian Weimer <fweimer@redhat.com>2024-05-02 20:51:28 +0200
commitce639236cabfaeb50d98c444d38297ffe70ae9ca (patch)
tree1805c4aaf7e3bcb4b7ebaa995a9c5a0225c8e5c0
parent85242ed63a33cac458eae3ffe504693680b686d9 (diff)
downloadglibc-ce639236cabfaeb50d98c444d38297ffe70ae9ca.tar.gz
glibc-ce639236cabfaeb50d98c444d38297ffe70ae9ca.tar.xz
glibc-ce639236cabfaeb50d98c444d38297ffe70ae9ca.zip
nscd: Use time_t for return type of addgetnetgrentX
Using int may give false results for future dates (timeouts after the
year 2028).

Fixes commit 04a21e050d64a1193a6daab872bca2528bda44b ("CVE-2024-33601,
CVE-2024-33602: nscd: netgroup: Use two buffers in addgetnetgrentX
(bug 31680)").

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit 4bbca1a44691a6e9adcee5c6798a707b626bc331)
-rw-r--r--nscd/netgroupcache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index aaabbbb003..adc34ba6b4 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -680,8 +680,8 @@ readdinnetgr (struct database_dyn *db, struct hashentry *he,
       .key_len = he->len
     };
 
-  int timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner,
-			     he, dh);
+  time_t timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner,
+				he, dh);
   if (timeout < 0)
     timeout = 0;
   return timeout;