Accepting request 249235 from home:Andreas_Schwab:glibc
- Update to glibc 2.20 release. * Reverted change of ABI data structures for s390 and s390x * Support for file description locks is added to systems running the Linux kernel * Optimized strchr implementation for AArch64 * The minimum Linux kernel version that this version of the GNU C Library can be used with is 2.6.32 * Running the testsuite no longer terminates as soon as a test fails * The am33 port, which had not worked for several years, has been removed from ports. * The _BSD_SOURCE and _SVID_SOURCE feature test macros are no longer supported; they now act the same as _DEFAULT_SOURCE (but generate a warning) * Optimized strcmp implementation for ARMv7 * Added support for TX lock elision of pthread mutexes on s390 and s390x * All supported architectures now use the main glibc sysdeps directory instead of some being in a separate "ports" directory * The NPTL implementation of POSIX pthreads is no longer an "add-on" * Locale names, including those obtained from environment variables (LANG and the LC_* variables), are more tightly checked for proper syntax * On x86-64, the dynamic linker's lazy-binding support is now compatible with application code using Intel MPX instructions - Patches from upstream removed * nss-dns-memleak.patch * sin-sign.patch * pldd-wait-ptrace-stop.patch * nscd-track-startup-failures.patch * powerpc-opt-power8.patch * check-pf-alloca.patch * getaddrinfo-uninit-result.patch OBS-URL: https://build.opensuse.org/request/show/249235 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=387
This commit is contained in:
139
psfaa.patch
139
psfaa.patch
@@ -1,139 +0,0 @@
|
||||
2014-06-11 Florian Weimer <fweimer@redhat.com>
|
||||
|
||||
[BZ #17048]
|
||||
* posix/spawn_int.h (struct __spawn_action): Make the path string
|
||||
non-const to support deallocation.
|
||||
* posix/spawn_faction_addopen.c
|
||||
(posix_spawn_file_actions_addopen): Make a copy of the pathname.
|
||||
* posix/spawn_faction_destroy.c
|
||||
(posix_spawn_file_actions_destroy): Adjust comment. Deallocate
|
||||
path in all spawn_do_open actions.
|
||||
* posix/tst-spawn.c (do_test): Exercise the copy operation in
|
||||
posix_spawn_file_actions_addopen.
|
||||
|
||||
Index: glibc-2.19/posix/spawn_faction_addopen.c
|
||||
===================================================================
|
||||
--- glibc-2.19.orig/posix/spawn_faction_addopen.c
|
||||
+++ glibc-2.19/posix/spawn_faction_addopen.c
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <errno.h>
|
||||
#include <spawn.h>
|
||||
#include <unistd.h>
|
||||
+#include <string.h>
|
||||
|
||||
#include "spawn_int.h"
|
||||
|
||||
@@ -35,17 +36,24 @@ posix_spawn_file_actions_addopen (posix_
|
||||
if (fd < 0 || fd >= maxfd)
|
||||
return EBADF;
|
||||
|
||||
+ char *path_copy = strdup (path);
|
||||
+ if (path_copy == NULL)
|
||||
+ return ENOMEM;
|
||||
+
|
||||
/* Allocate more memory if needed. */
|
||||
if (file_actions->__used == file_actions->__allocated
|
||||
&& __posix_spawn_file_actions_realloc (file_actions) != 0)
|
||||
- /* This can only mean we ran out of memory. */
|
||||
- return ENOMEM;
|
||||
+ {
|
||||
+ /* This can only mean we ran out of memory. */
|
||||
+ free (path_copy);
|
||||
+ return ENOMEM;
|
||||
+ }
|
||||
|
||||
/* Add the new value. */
|
||||
rec = &file_actions->__actions[file_actions->__used];
|
||||
rec->tag = spawn_do_open;
|
||||
rec->action.open_action.fd = fd;
|
||||
- rec->action.open_action.path = path;
|
||||
+ rec->action.open_action.path = path_copy;
|
||||
rec->action.open_action.oflag = oflag;
|
||||
rec->action.open_action.mode = mode;
|
||||
|
||||
Index: glibc-2.19/posix/spawn_faction_destroy.c
|
||||
===================================================================
|
||||
--- glibc-2.19.orig/posix/spawn_faction_destroy.c
|
||||
+++ glibc-2.19/posix/spawn_faction_destroy.c
|
||||
@@ -18,11 +18,29 @@
|
||||
#include <spawn.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
-/* Initialize data structure for file attribute for `spawn' call. */
|
||||
+#include "spawn_int.h"
|
||||
+
|
||||
+/* Deallocate the file actions. */
|
||||
int
|
||||
posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *file_actions)
|
||||
{
|
||||
- /* Free the memory allocated. */
|
||||
+ /* Free the paths in the open actions. */
|
||||
+ for (int i = 0; i < file_actions->__used; ++i)
|
||||
+ {
|
||||
+ struct __spawn_action *sa = &file_actions->__actions[i];
|
||||
+ switch (sa->tag)
|
||||
+ {
|
||||
+ case spawn_do_open:
|
||||
+ free (sa->action.open_action.path);
|
||||
+ break;
|
||||
+ case spawn_do_close:
|
||||
+ case spawn_do_dup2:
|
||||
+ /* No cleanup required. */
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Free the array of actions. */
|
||||
free (file_actions->__actions);
|
||||
return 0;
|
||||
}
|
||||
Index: glibc-2.19/posix/spawn_int.h
|
||||
===================================================================
|
||||
--- glibc-2.19.orig/posix/spawn_int.h
|
||||
+++ glibc-2.19/posix/spawn_int.h
|
||||
@@ -22,7 +22,7 @@ struct __spawn_action
|
||||
struct
|
||||
{
|
||||
int fd;
|
||||
- const char *path;
|
||||
+ char *path;
|
||||
int oflag;
|
||||
mode_t mode;
|
||||
} open_action;
|
||||
Index: glibc-2.19/posix/tst-spawn.c
|
||||
===================================================================
|
||||
--- glibc-2.19.orig/posix/tst-spawn.c
|
||||
+++ glibc-2.19/posix/tst-spawn.c
|
||||
@@ -168,6 +168,7 @@ do_test (int argc, char *argv[])
|
||||
char fd2name[18];
|
||||
char fd3name[18];
|
||||
char fd4name[18];
|
||||
+ char *name3_copy;
|
||||
char *spargv[12];
|
||||
int i;
|
||||
|
||||
@@ -222,9 +223,15 @@ do_test (int argc, char *argv[])
|
||||
if (posix_spawn_file_actions_addclose (&actions, fd1) != 0)
|
||||
error (EXIT_FAILURE, errno, "posix_spawn_file_actions_addclose");
|
||||
/* We want to open the third file. */
|
||||
- if (posix_spawn_file_actions_addopen (&actions, fd3, name3,
|
||||
+ name3_copy = strdup (name3);
|
||||
+ if (name3_copy == NULL)
|
||||
+ error (EXIT_FAILURE, errno, "strdup");
|
||||
+ if (posix_spawn_file_actions_addopen (&actions, fd3, name3_copy,
|
||||
O_RDONLY, 0666) != 0)
|
||||
error (EXIT_FAILURE, errno, "posix_spawn_file_actions_addopen");
|
||||
+ /* Overwrite the name to check that a copy has been made. */
|
||||
+ memset (name3_copy, 'X', strlen (name3_copy));
|
||||
+
|
||||
/* We dup the second descriptor. */
|
||||
fd4 = MAX (2, MAX (fd1, MAX (fd2, fd3))) + 1;
|
||||
if (posix_spawn_file_actions_adddup2 (&actions, fd2, fd4) != 0)
|
||||
@@ -253,6 +260,7 @@ do_test (int argc, char *argv[])
|
||||
/* Cleanup. */
|
||||
if (posix_spawn_file_actions_destroy (&actions) != 0)
|
||||
error (EXIT_FAILURE, errno, "posix_spawn_file_actions_destroy");
|
||||
+ free (name3_copy);
|
||||
|
||||
/* Wait for the child. */
|
||||
if (waitpid (pid, &status, 0) != pid)
|
Reference in New Issue
Block a user