forked from pool/glibc
Andreas Schwab
d5d82b07e2
- regex-read-overrun.patch: fix read overrun (CVE-2019-9169, bsc#1127308, BZ #24114) - ldconfig-concurrency.patch: Avoid concurrency problem in ldconfig (bsc#1117993, BZ #23973) OBS-URL: https://build.opensuse.org/request/show/681702 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=521
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
* elf/cache.c (save_cache): Use unique temporary name.
|
|
(save_aux_cache): Likewise.
|
|
|
|
Index: glibc-2.29/elf/cache.c
|
|
===================================================================
|
|
--- glibc-2.29.orig/elf/cache.c
|
|
+++ glibc-2.29/elf/cache.c
|
|
@@ -427,12 +427,12 @@ save_cache (const char *cache_name)
|
|
/* Write out the cache. */
|
|
|
|
/* Write cache first to a temporary file and rename it later. */
|
|
- char *temp_name = xmalloc (strlen (cache_name) + 2);
|
|
- sprintf (temp_name, "%s~", cache_name);
|
|
+ char *temp_name;
|
|
+ if (asprintf (&temp_name, "%s.XXXXXX", cache_name) < 0)
|
|
+ error (EXIT_FAILURE, errno, _("Can't allocate temporary name for cache file"));
|
|
|
|
/* Create file. */
|
|
- int fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW,
|
|
- S_IRUSR|S_IWUSR);
|
|
+ int fd = mkostemp (temp_name, 0);
|
|
if (fd < 0)
|
|
error (EXIT_FAILURE, errno, _("Can't create temporary cache file %s"),
|
|
temp_name);
|
|
@@ -481,6 +481,7 @@ save_cache (const char *cache_name)
|
|
free (file_entries_new);
|
|
free (file_entries);
|
|
free (strings);
|
|
+ free (temp_name);
|
|
|
|
while (entries)
|
|
{
|
|
@@ -804,8 +805,9 @@ save_aux_cache (const char *aux_cache_na
|
|
/* Write out auxiliary cache file. */
|
|
/* Write auxiliary cache first to a temporary file and rename it later. */
|
|
|
|
- char *temp_name = xmalloc (strlen (aux_cache_name) + 2);
|
|
- sprintf (temp_name, "%s~", aux_cache_name);
|
|
+ char *temp_name;
|
|
+ if (asprintf (&temp_name, "%s.XXXXXX", aux_cache_name) < 0)
|
|
+ goto out_fail2;
|
|
|
|
/* Check that directory exists and create if needed. */
|
|
char *dir = strdupa (aux_cache_name);
|
|
@@ -819,8 +821,7 @@ save_aux_cache (const char *aux_cache_na
|
|
}
|
|
|
|
/* Create file. */
|
|
- int fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW,
|
|
- S_IRUSR|S_IWUSR);
|
|
+ int fd = mkostemp (temp_name, 0);
|
|
if (fd < 0)
|
|
goto out_fail;
|
|
|
|
@@ -840,5 +841,6 @@ save_aux_cache (const char *aux_cache_na
|
|
out_fail:
|
|
/* Free allocated memory. */
|
|
free (temp_name);
|
|
+out_fail2:
|
|
free (file_entries);
|
|
}
|