From: Aaron Merey <amerey@redhat.com>
Date: Wed, 8 Feb 2023 02:15:33 +0000 (-0500)
Subject: debuginfod-client.c: Download section even if cached executable didn't contain it.
X-Git-Tag: elfutils-0.189~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53b596ef4018693403395d702045c15762af3da7;p=thirdparty%2Felfutils.git

debuginfod-client.c: Download section even if cached executable didn't contain it.

Before attempting to download a section, cache_find_section tries to
extract the section from existing files in the cache. If it's determined
that the section must not exist, cache_find_section returns -ENOENT to
indicate that the download should be skipped.

This patch fixes a bug where cache_find_section returns -ENOENT even
though the section exists.  If the cache contains the executable but
not the debuginfo with the given build-id and the section only exists
in the debuginfo (such as any of the .debug_* sections), then
debuginfod_find_section returns -ENOENT even if the section could be
downloaded.

Fix this by having cache_find_section not return -ENOENT unless cached
debuginfo was able to be read.

Signed-off-by: Aaron Merey <amerey@redhat.com>
---

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index fe368c486..f861eb72a 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-07  Aaron Merey  <amerey@redhat.com>
+
+	* debuginfod-client.c (cache_find_section): Avoid returning -ENOENT
+	if debuginfo wasn't found.
+
 2023-02-06  Mark Wielaard  <mark@klomp.org>
 
 	* debuginfod.h.in: Guard debuginfod_client typedef with
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index 5f2a1024f..ef4d47e32 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -785,23 +785,24 @@ out:
    an ELF/DWARF section with name SCN_NAME.  If found, extract the section
    to a separate file in TARGET_CACHE_DIR and return a file descriptor
    for the section file. The path for this file will be stored in USR_PATH.
-   Return a negative errno if unsuccessful.  */
+   Return a negative errno if unsuccessful.  -ENOENT indicates that SCN_NAME
+   is confirmed to not exist.  */
 
 static int
 cache_find_section (const char *scn_name, const char *target_cache_dir,
 		    char **usr_path)
 {
-  int fd;
+  int debug_fd;
   int rc = -EEXIST;
   char parent_path[PATH_MAX];
 
   /* Check the debuginfo first.  */
   snprintf (parent_path, PATH_MAX, "%s/debuginfo", target_cache_dir);
-  fd = open (parent_path, O_RDONLY);
-  if (fd >= 0)
+  debug_fd = open (parent_path, O_RDONLY);
+  if (debug_fd >= 0)
     {
-      rc = extract_section (fd, scn_name, parent_path, usr_path);
-      close (fd);
+      rc = extract_section (debug_fd, scn_name, parent_path, usr_path);
+      close (debug_fd);
     }
 
   /* If the debuginfo file couldn't be found or the section type was
@@ -809,12 +810,17 @@ cache_find_section (const char *scn_name, const char *target_cache_dir,
   if (rc == -EEXIST)
     {
       snprintf (parent_path, PATH_MAX, "%s/executable", target_cache_dir);
-      fd = open (parent_path, O_RDONLY);
+      int exec_fd = open (parent_path, O_RDONLY);
 
-      if (fd >= 0)
+      if (exec_fd >= 0)
 	{
-	  rc = extract_section (fd, scn_name, parent_path, usr_path);
-	  close (fd);
+	  rc = extract_section (exec_fd, scn_name, parent_path, usr_path);
+	  close (exec_fd);
+
+	  /* Don't return -ENOENT if the debuginfo wasn't opened.  The
+	     section may exist in the debuginfo but not the executable.  */
+	  if (debug_fd < 0 && rc == -ENOENT)
+	    rc = -EREMOTE;
 	}
     }