wok-current annotate glibc/stuff/CVE-2024-33601_CVE-2024-33602_2.patch @ rev 25728

Merge wok for both arch and few updates
author Stanislas Leduc <shann@slitaz.org>
date Thu Dec 05 08:39:45 2024 +0000 (10 months ago)
parents
children
rev   line source
shann@25728 1 From 1e398f406bb7ad8ffac66e664a44f11d2a0b8f36 Mon Sep 17 00:00:00 2001
shann@25728 2 From: Florian Weimer <fweimer@redhat.com>
shann@25728 3 Date: Thu, 2 May 2024 17:06:19 +0200
shann@25728 4 Subject: [PATCH] nscd: Use time_t for return type of addgetnetgrentX
shann@25728 5
shann@25728 6 Using int may give false results for future dates (timeouts after the
shann@25728 7 year 2028).
shann@25728 8
shann@25728 9 Fixes commit 04a21e050d64a1193a6daab872bca2528bda44b ("CVE-2024-33601,
shann@25728 10 CVE-2024-33602: nscd: netgroup: Use two buffers in addgetnetgrentX
shann@25728 11 (bug 31680)").
shann@25728 12
shann@25728 13 Reviewed-by: Carlos O'Donell <carlos@redhat.com>
shann@25728 14 (cherry picked from commit 4bbca1a44691a6e9adcee5c6798a707b626bc331)
shann@25728 15 ---
shann@25728 16 nscd/netgroupcache.c | 4 ++--
shann@25728 17 1 file changed, 2 insertions(+), 2 deletions(-)
shann@25728 18
shann@25728 19 diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
shann@25728 20 index ee98ffd96ed..7a4e767be2b 100644
shann@25728 21 --- a/nscd/netgroupcache.c
shann@25728 22 +++ b/nscd/netgroupcache.c
shann@25728 23 @@ -681,8 +681,8 @@ readdinnetgr (struct database_dyn *db, struct hashentry *he,
shann@25728 24 .key_len = he->len
shann@25728 25 };
shann@25728 26
shann@25728 27 - int timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner,
shann@25728 28 - he, dh);
shann@25728 29 + time_t timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner,
shann@25728 30 + he, dh);
shann@25728 31 if (timeout < 0)
shann@25728 32 timeout = 0;
shann@25728 33 return timeout;