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 22:04:35 +0200
commit4888ffdbb39e7649a2b4bac0d226cb0d7786b196 (patch)
tree084dca676c896bc9889c6e701086f2b3292694fb
parentbb2ec7502289aaf794d7e9ac7f12c9d03ab8cf7c (diff)
downloadglibc-4888ffdbb39e7649a2b4bac0d226cb0d7786b196.tar.gz
glibc-4888ffdbb39e7649a2b4bac0d226cb0d7786b196.tar.xz
glibc-4888ffdbb39e7649a2b4bac0d226cb0d7786b196.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 92c9cb36fb..f8dfc95cb6 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -681,8 +681,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;