resolv: Track single-request fallback via _res._flags (bug 31476)

This avoids changing _res.options, which inteferes with change
detection as part of automatic reloading of /etc/resolv.conf.

Reviewed-by: DJ Delorie <dj@redhat.com>
(cherry picked from commit 868ab8923a2ec977faafec97ecafac0c3159c1b2)

diff --git a/NEWS b/NEWS
index 9f95df7ae177b2cb809814c2da165f603c5110f9..ad2d2dd25a55fe99f9c8ddd70129bbf57a77549e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,7 @@ The following bugs are resolved with this release:
   [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with
     -D_FILE_OFFSET_BITS=64
   [30843] potential use-after-free in getcanonname (CVE-2023-4806)
+  [31476] resolv: Track single-request fallback via _res._flags
   [31184] FAIL: elf/tst-tlsgap
   [31185] Incorrect thread point access in _dl_tlsdesc_undefweak and _dl_tlsdesc_dynamic
   [31890] resolv: Allow short error responses to match any DNS query

diff --git a/resolv/res_send.c b/resolv/res_send.c
index 12fd9263723784f543f887052c418a70c05d052a..6bd27b8620c1e77350d7571a00eb6d25fe41864e 100644 (file)
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -942,9 +942,11 @@ send_dg(res_state statp,
                seconds /= statp->nscount;
        if (seconds <= 0)
                seconds = 1;
-       bool single_request_reopen = (statp->options & RES_SNGLKUPREOP) != 0;
-       bool single_request = (((statp->options & RES_SNGLKUP) != 0)
-                              | single_request_reopen);
+       bool single_request_reopen = ((statp->options & RES_SNGLKUPREOP)
+                                     || (statp->_flags & RES_F_SNGLKUPREOP));
+       bool single_request = ((statp->options & RES_SNGLKUP)
+                              || (statp->_flags & RES_F_SNGLKUP)
+                              || single_request_reopen);
        int save_gotsomewhere = *gotsomewhere;
 
        int retval;
@@ -1001,14 +1003,14 @@ send_dg(res_state statp,
                       have received the first answer.  */
                    if (!single_request)
                      {
-                       statp->options |= RES_SNGLKUP;
+                       statp->_flags |= RES_F_SNGLKUP;
                        single_request = true;
                        *gotsomewhere = save_gotsomewhere;
                        goto retry;
                      }
                    else if (!single_request_reopen)
                      {
-                       statp->options |= RES_SNGLKUPREOP;
+                       statp->_flags |= RES_F_SNGLKUPREOP;
                        single_request_reopen = true;
                        *gotsomewhere = save_gotsomewhere;
                        __res_iclose (statp, false);

diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h
index 2fa57d394f70bcad372074401ad43c42bc4c6776..f259b5c9e515c909b5b77ec37f1e1171fa98148d 100644 (file)
--- a/resolv/resolv-internal.h
+++ b/resolv/resolv-internal.h
@@ -26,6 +26,8 @@
 #define RES_F_VC        0x00000001 /* Socket is TCP.  */
 #define RES_F_CONN      0x00000002 /* Socket is connected.  */
 #define RES_F_EDNS0ERR  0x00000004 /* EDNS0 caused errors.  */
+#define RES_F_SNGLKUP  0x00200000 /* Private version of RES_SNGLKUP.  */
+#define RES_F_SNGLKUPREOP 0x00400000 /* Private version of RES_SNGLKUPREOP.  */
 
 /* Legacy function.  This needs to be removed once all NSS modules
    have been adjusted.  */