13.29: Annocheck: Fix bug checking the path safety of the --debug-dir optionHEAD master

author: Nick Clifton <nickc@redhat.com> 2026-08-11 11:15:17 +0100
committer: Nick Clifton <nickc@redhat.com> 2026-08-11 11:15:17 +0100
commit: 2a01c2ef59ad01acdf64a3d1dcb424a1deca8eb8 (patch)
tree: 612e7cbf67ae3c0dd40da4831308e1cc91fdd08a
parent: Fix a few code readability issues reported by clang-tidy (diff)
4 files changed, 66 insertions, 35 deletions
diff --git a/annocheck/annocheck.c b/annocheck/annocheck.c
index 2086495..02faba2 100644
--- a/annocheck/annocheck.c
+++ b/annocheck/annocheck.c
@@ -628,32 +628,45 @@ itoa (uint lev)
 static bool
 extract_rpm_into_dir (const char * rpm, const char * dirname)
 {
+  /* These should never trigger, but better safe than sorry.  */
+  if (! is_safe_path (dirname))
+    return afinfo (WARN, dirname, "Suspicious characeter(s) in directory path");
+  if (! is_safe_path (rpm))
+    return afinfo (WARN, rpm, "Suspicious characeter(s) in rpm name");
+  /* If filename is a relative path, convert it to an absolute one so
+     that it can be found once we change into the temporary directory.  */
  char * fname;
-  char * cwd = getcwd (NULL, 0);
-  /* If filename is a relative path, convert it to an absolute one
-     so that it can be found once we change into the temporary directory.  */
  if (rpm[0] != '/')
-    fname = concat (cwd, "/", rpm, NULL);
+    {
+      char * cwd = getcwd (NULL, 0);
+      if (cwd == NULL)
+        return einfo (SYS_ERROR, "Unable to retrieve the current working directory");
+      fname = concat (cwd, "/", rpm, NULL);
+      free (cwd);
+    }
  else
    /* This is just so that we can safely call free(fname) at the end.  */
    fname = concat (rpm, NULL);
-  if (access (rpm, F_OK) == -1)
+  /* This should never happen, but better safe than sorry.  */
+  if (! is_safe_path (fname))
    {
-      afinfo (SYS_ERROR, fname, "Error reading rpm file");
+      afinfo (WARN, fname, "Suspicious characeter(s) in computed file name path");
-      free (cwd);
      free (fname);
      return false;
    }
-  /* This should never happen, but better safe than sorry.  */
+  if (access (fname, F_OK) == -1)
-  if (! is_safe_path (dirname) || ! is_safe_path (fname))
    {
+      afinfo (SYS_ERROR, fname, "Unable to access rpm file");
      free (fname);
-      return afinfo (WARN, NULL, "Suspicious characeter(s) in paths");
+      return false;
    }
+  
  char * command;
  command = concat (/* Change into the temporary directory.  */
                    "cd ", dirname,
@@ -665,22 +678,18 @@ extract_rpm_into_dir (const char * rpm, const char * dirname)
                    " && cd ..",
                    NULL);
+  free (fname);
+  
  afinfo (VERBOSE2, NULL, "Running rpm extractor command sequence: %s", command);
  fflush (stdin);
  if (system (command))
    {
-      afinfo (WARN, rpm, "Failed to extract rpm file");
      free (command);
-      free (cwd);
+      return afinfo (WARN, rpm, "Failed to extract rpm file");
-      free (fname);
-      return false;
    }
  free (command);
-  free (cwd);
-  free (fname);
  return afinfo (VERBOSE2, rpm, "extracted into %s", dirname);
 }
@@ -730,10 +739,18 @@ extract_debug_rpm_files (void)
      using_tmpdir = true;
      char * cwd = getcwd (NULL, 0);
-      const char * tmp = concat ("--debug-dir=", cwd, "/", tmp_debug_dir, NULL);
+      if (cwd == NULL)
+        {
+          einfo (SYS_ERROR, "Unable to retrieve the current working directory");
+          free ((void *) tmp_debug_dir);
+          return NULL;
+        }
+#define DEBUG_DIR_OPTION "--debug-dir="
+      const char * tmp = concat (DEBUG_DIR_OPTION, cwd, "/", tmp_debug_dir, NULL);
      /* This should never happen, but let's be paranoid.  */
-      if (! is_safe_path (tmp))
+      if (! is_safe_path (tmp + strlen (DEBUG_DIR_OPTION)))
        {
          afinfo (ERROR, tmp, "Path to temporary debug dir contains suspicious characters");
          free ((void *) tmp_debug_dir);
@@ -1923,10 +1940,12 @@ process_ar (const char * filename, int fd, Elf * elf)
   Returns false otherwise.  */
 static bool
-unpack_and_process (const char * filename, const char * tmp_dir,
+unpack_and_process (const char * filename,
-                    const char * extraction_tool1, const char * extraction_tool2)
+                    const char * tmp_dir,
+                    const char * extraction_tool1,
+                    const char * extraction_tool2)
 {
-  char * dirname;
+  char * dirname = NULL;
  /* Paranoia.  */
  if (filename == NULL || filename[0] == 0
@@ -1934,11 +1953,10 @@ unpack_and_process (const char * filename, const char * tmp_dir,
      || extraction_tool1 == NULL || extraction_tool1[0] == 0)
    /* It is OK for extraction_tool2 to be NULL.  */
    return afinfo (WARN, filename, "unpack_and_process called with invalid arguments");
-    
  if (asprintf (& dirname, "%s%s", tmp_dir, "XXXXXX") < 8)
    {
-      if (dirname != NULL)
+      free (dirname);
-        free (dirname);
      return afinfo (WARN, filename, "unable to allocate temporary directory name");
    }
@@ -1955,6 +1973,11 @@ unpack_and_process (const char * filename, const char * tmp_dir,
  char * pname;
  char * command;
  char * cwd = getcwd (NULL, 0);
+  if (cwd == NULL)
+    {
+      free (dirname);
+      return afinfo (SYS_ERROR, NULL, "Unable to retrieve the current working directory");
+    }
  /* If necessary convert FILENAME into an absolute path.  */
  if (filename[0] != '/')
@@ -2638,6 +2661,12 @@ create_tmpdir (void)
    }
  const char * cwd = getcwd (NULL, 0);
+  if (cwd == NULL)
+    {
+      afinfo (SYS_ERROR, NULL, "Unable to retrieve the current working directory");
+      return NULL;
+    }
+  
  tmpdir = concat (cwd, "/", tmpdir, NULL);
  free ((void *) cwd);
@@ -2881,15 +2910,16 @@ save_file_arg (const char * parameter, file_option updating)
          const char * home = getenv ("HOME");
          if (home == NULL)
-            {
+            return afinfo (SYS_WARN, NULL, "HOME environment variable is not set, unable to expand ~ in path");
-              einfo (WARN, "HOME environment variable is not set, unable to expand ~ in path");
-              return false;
-            }
          cwd = concat (home, NULL);
          parameter += 2;
        }
      else
-        cwd = getcwd (NULL, 0);
+        {
+          cwd = getcwd (NULL, 0);
+          if (cwd == NULL)
+            return afinfo (SYS_WARN, NULL, "Unable to retrieve current working directory");
+        }
      parameter = concat (cwd, "/", parameter, NULL);
@@ -3258,7 +3288,8 @@ process_command_line (uint argc, const char * argv[])
          afinfo (VERBOSE2, test, "Possible associated debuginfo rpm");
          if (is_safe_path (test)
-              && stat (test, & statbuf) == 0 && S_ISREG (statbuf.st_mode))
+              && stat (test, & statbuf) == 0
+              && S_ISREG (statbuf.st_mode))
            {
              if (save_file_arg (test, Debug_rpm))
                afinfo (WARN, test, "Unable to save in debug rpm list");
diff --git a/configure b/configure
index b715d6a..21095e2 100755
--- a/configure
+++ b/configure
@@ -2703,7 +2703,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # also update VERSION in the PROJECT section of meson.build.
 # Also note that the number after the decimal point is limited
 # to two digits due to various assumptions in the code.
-ANNOBIN_VERSION=13.28
+ANNOBIN_VERSION=13.29
 # Make sure we can run config.sub.
diff --git a/configure.ac b/configure.ac
index 1f1a340..22f6323 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_CONFIG_SRCDIR([annobin-global.h.in])
 # also update VERSION in the PROJECT section of meson.build.
 # Also note that the number after the decimal point is limited
 # to two digits due to various assumptions in the code.
-ANNOBIN_VERSION=13.28
+ANNOBIN_VERSION=13.29
 AC_SUBST(ANNOBIN_VERSION)
 AC_CANONICAL_SYSTEM
diff --git a/meson.build b/meson.build
index efe9e90..62b1e45 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@
 project(
  'annobin',
  ['c', 'cpp'],
-  version: '13.28',
+  version: '13.29',
  meson_version: '>=0.59'
 )
author	Nick Clifton <nickc@redhat.com>	2026-08-11 11:15:17 +0100
committer	Nick Clifton <nickc@redhat.com>	2026-08-11 11:15:17 +0100
commit	2a01c2ef59ad01acdf64a3d1dcb424a1deca8eb8 (patch)
tree	612e7cbf67ae3c0dd40da4831308e1cc91fdd08a
parent	Fix a few code readability issues reported by clang-tidy (diff)