diff options
author | Florian Weimer <fweimer@redhat.com> | 2023-10-23 12:53:16 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2023-11-20 10:57:34 +0100 |
commit | cfb5a97a93ea656e3b2263e42142a4032986d9ba (patch) | |
tree | 8c8527556c740080ae9ea8325e3de74703adcb56 | |
parent | e21aa9b9cc6083d3b1da72c81e7a4e81662e32ba (diff) | |
download | glibc-cfb5a97a93ea656e3b2263e42142a4032986d9ba.tar glibc-cfb5a97a93ea656e3b2263e42142a4032986d9ba.tar.gz glibc-cfb5a97a93ea656e3b2263e42142a4032986d9ba.tar.bz2 glibc-cfb5a97a93ea656e3b2263e42142a4032986d9ba.zip |
ldconfig: Fixes for skipping temporary files.
Arguments to a memchr call were swapped, causing incorrect skipping
of files.
Files related to dpkg have different names: they actually end in
.dpkg-new and .dpkg-tmp, not .tmp as I mistakenly assumed.
Fixes commit 2aa0974d2573441bffd59 ("elf: ldconfig should skip
temporary files created by package managers").
-rw-r--r-- | elf/ldconfig.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 02387a169c..bccd386761 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -661,6 +661,17 @@ struct dlib_entry struct dlib_entry *next; }; +/* Return true if the N bytes at NAME end with with the characters in + the string SUFFIX. (NAME[N + 1] does not have to be a null byte.) + Expected to be called with a string literal for SUFFIX. */ +static inline bool +endswithn (const char *name, size_t n, const char *suffix) +{ + return (n >= strlen (suffix) + && memcmp (name + n - strlen (suffix), suffix, + strlen (suffix)) == 0); +} + /* Skip some temporary DSO files. These files may be partially written and lead to ldconfig crashes when examined. */ static bool @@ -670,8 +681,7 @@ skip_dso_based_on_name (const char *name, size_t len) names like these are never really DSOs we want to look at. */ if (len >= sizeof (".#prelink#") - 1) { - if (strcmp (name + len - sizeof (".#prelink#") + 1, - ".#prelink#") == 0) + if (endswithn (name, len, ".#prelink#")) return true; if (len >= sizeof (".#prelink#.XXXXXX") - 1 && memcmp (name + len - sizeof (".#prelink#.XXXXXX") @@ -679,10 +689,11 @@ skip_dso_based_on_name (const char *name, size_t len) return true; } /* Skip temporary files created by RPM. */ - if (memchr (name, len, ';') != NULL) + if (memchr (name, ';', len) != NULL) return true; /* Skip temporary files created by dpkg. */ - if (len > 4 && memcmp (name + len - 4, ".tmp", 4) == 0) + if (endswithn (name, len, ".dpkg-new") + || endswithn (name, len, ".dpkg-tmp")) return true; return false; } |