glibc/SOURCES/glibc-rh1810142-5.patch

53 lines
2.2 KiB
Diff
Raw Normal View History

2020-11-03 11:44:24 +00:00
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 21 Jan 2020 16:38:15 +0000 (+0100)
Subject: resolv: Fix ABA race in /etc/resolv.conf change detection [BZ #25420]
X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=fa00db0a6eb755837ae5d413515e0da582b304f3
resolv: Fix ABA race in /etc/resolv.conf change detection [BZ #25420]
__resolv_conf_get_current should only record the initial file
change data if after verifying that file just read matches the
original measurement. Fixes commit aef16cc8a4c670036d45590877
("resolv: Automatically reload a changed /etc/resolv.conf file
[BZ #984]").
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
diff --git a/resolv/resolv_conf.c b/resolv/resolv_conf.c
index bdd2ebb909..29a1f4fb94 100644
--- a/resolv/resolv_conf.c
+++ b/resolv/resolv_conf.c
@@ -136,18 +136,25 @@ __resolv_conf_get_current (void)
{
/* Parse configuration while holding the lock. This avoids
duplicate work. */
- conf = __resolv_conf_load (NULL, NULL);
+ struct file_change_detection after_load;
+ conf = __resolv_conf_load (NULL, &after_load);
if (conf != NULL)
{
if (global_copy->conf_current != NULL)
conf_decrement (global_copy->conf_current);
global_copy->conf_current = conf; /* Takes ownership. */
- /* Update file modification stamps. The configuration we
- read could be a newer version of the file, but this does
- not matter because this will lead to an extraneous reload
- later. */
- global_copy->file_resolve_conf = initial;
+ /* Update file change detection data, but only if it matches
+ the initial measurement. This avoids an ABA race in case
+ /etc/resolv.conf is temporarily replaced while the file
+ is read (after the initial measurement), and restored to
+ the initial version later. */
+ if (file_is_unchanged (&initial, &after_load))
+ global_copy->file_resolve_conf = after_load;
+ else
+ /* If there is a discrepancy, trigger a reload during the
+ next use. */
+ global_copy->file_resolve_conf.size = -1;
}
}