aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2010-06-15 14:47:58 -0500
committerMark Hatle <mark.hatle@windriver.com>2010-07-22 19:16:20 -0500
commitd15d629f73725f310b7e386057cbddb8b40bd294 (patch)
tree673c4b33bc6eac9953706710e3174a177dada580
parent45f3e0e99fc1f0385ef2fa5f8c5fd126edb1805c (diff)
downloadprelink-cross-d15d629f73725f310b7e386057cbddb8b40bd294.tar.gz
prelink-cross-d15d629f73725f310b7e386057cbddb8b40bd294.tar.bz2
prelink-cross-d15d629f73725f310b7e386057cbddb8b40bd294.zip
Merge to upstream r184
2009-06-15 Mark Hatle <mark.hatle@windriver.com> * Merge to upstream r184 * Resync dso-readonly.c from dso.c * Cleanup ChangeLog.cross
-rw-r--r--trunk/ChangeLog.cross21
-rw-r--r--trunk/src/dso-readonly.c68
2 files changed, 75 insertions, 14 deletions
diff --git a/trunk/ChangeLog.cross b/trunk/ChangeLog.cross
index 6a4acf6..b6c4f5b 100644
--- a/trunk/ChangeLog.cross
+++ b/trunk/ChangeLog.cross
@@ -1,24 +1,33 @@
-2009-09-01 Maciej W. Rozycki <macro@codesourcery.com>
+2009-06-15 Mark Hatle <mark.hatle@windriver.com>
+ * Merge to upstream r184
+ * Resync dso-readonly.c from dso.c
+ * Cleanup ChangeLog.cross
+
+2009-06-15 Mark Hatle <mark.hatle@windriver.com>
+
+ * Integrate prelinker/cross-prelinking patches
+
+ 2009-09-01 Maciej W. Rozycki <macro@codesourcery.com>
Issue #5273
* src/arch-mips.c (mips_prelink_reloc): Resolve
R_MIPS_TLS_DTPMOD32 and R_MIPS_TLS_DTPMOD64 relocations in
executables.
-2009-04-27 Maciej W. Rozycki <macro@codesourcery.com>
+ 2009-04-27 Maciej W. Rozycki <macro@codesourcery.com>
+
Issue #5165
* src/ld-libs.c (load_ld_so_conf): Fix a buffer overrun. Don't
record empty paths.
-
-2009-04-23 Maciej W. Rozycki <macro@codesourcery.com>
+ 2009-04-23 Maciej W. Rozycki <macro@codesourcery.com>
Issue #5165
* src/ld-lookup.c (rtld_elf_hash): Handle an initial NULL
character correctly. Reformat for consistency with
rtld_elf_gnu_hash()
-2009-04-23 Maciej W. Rozycki <macro@codesourcery.com>
+ 2009-04-23 Maciej W. Rozycki <macro@codesourcery.com>
Issue #5165
* src/ld-do-lookup.h (FCT): Remove the hash argument and
@@ -37,7 +46,7 @@
(rtld_lookup_symbol): Remove hash calculation.
(rtld_lookup_symbol_versioned): Likewise.
-2009-04-23 Maciej W. Rozycki <macro@codesourcery.com>
+ 2009-04-23 Maciej W. Rozycki <macro@codesourcery.com>
Issue #5165
* src/execle_open.c (execve_open): Add missing pid
diff --git a/trunk/src/dso-readonly.c b/trunk/src/dso-readonly.c
index f780e9a..6faebfa 100644
--- a/trunk/src/dso-readonly.c
+++ b/trunk/src/dso-readonly.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.
This program is free software; you can redistribute it and/or modify
@@ -1731,8 +1731,9 @@ write_dso (DSO *dso)
return 0;
}
-int
-set_security_context (DSO *dso, const char *temp_name, const char *name)
+static int
+set_security_context (const char *temp_name, const char *name,
+ int ignore_errors)
{
#ifdef USE_SELINUX
static int selinux_enabled = -1;
@@ -1753,7 +1754,7 @@ set_security_context (DSO *dso, const char *temp_name, const char *name)
name);
return 1;
}
- if (setfilecon (temp_name, scontext) < 0)
+ if (setfilecon (temp_name, scontext) < 0 && !ignore_errors)
{
error (0, errno, "Could not set security context for %s",
name);
@@ -1776,6 +1777,7 @@ update_dso (DSO *dso, const char *orig_name)
char *name1, *name2;
struct utimbuf u;
struct stat64 st;
+ int fdin, fdout;
switch (write_dso (dso))
{
@@ -1798,30 +1800,80 @@ update_dso (DSO *dso, const char *orig_name)
close_dso (dso);
return 1;
}
- if (fchown (dso->fd, st.st_uid, st.st_gid) < 0
- || fchmod (dso->fd, st.st_mode & 07777) < 0)
+ if ((fchown (dso->fd, st.st_uid, st.st_gid) < 0
+ || fchmod (dso->fd, st.st_mode & 07777) < 0)
+ && orig_name == NULL)
{
error (0, errno, "Could not set %s owner or mode", dso->filename);
close_dso (dso);
return 1;
}
+ if (orig_name != NULL)
+ fdin = dup (dso->fd);
+ else
+ fdin = -1;
close_dso_1 (dso);
u.actime = time (NULL);
u.modtime = st.st_mtime;
wrap_utime (name2, &u);
- if (set_security_context (dso, name2, orig_name ? orig_name : name1))
+ if (set_security_context (name2, orig_name ? orig_name : name1,
+ orig_name != NULL))
{
+ if (fdin != -1)
+ close (fdin);
wrap_unlink (name2);
return 1;
}
- if (wrap_rename (name2, name1))
+ if ((orig_name != NULL && strcmp (name1, "-") == 0)
+ || wrap_rename (name2, name1))
{
+ if (fdin != -1)
+ {
+ struct stat64 stt;
+ off_t off = 0;
+ int err;
+ if (strcmp (name1, "-") == 0)
+ fdout = 1;
+ else
+ fdout = wrap_open (name1, O_WRONLY | O_CREAT, 0600);
+ if (fdout != -1
+ && fstat64 (fdin, &stt) >= 0
+ && send_file (fdout, fdin, &off, stt.st_size) == stt.st_size)
+ {
+ close (fdin);
+ if (fchown (fdout, st.st_uid, st.st_gid) >= 0)
+ fchmod (fdout, st.st_mode & 07777);
+ if (strcmp (name1, "-") != 0)
+ {
+ set_security_context (name1, name1, 1);
+ wrap_utime (name1, &u);
+ close (fdout);
+ }
+ wrap_unlink (name2);
+ return 0;
+ }
+ else if (fdout != -1)
+ {
+ err = errno;
+ if (strcmp (name1, "-") == 0)
+ close (fdout);
+ }
+ else
+ err = errno;
+ close (fdin);
+ wrap_unlink (name2);
+ error (0, err, "Could not rename nor copy temporary to %s",
+ name1);
+ return 1;
+ }
wrap_unlink (name2);
error (0, errno, "Could not rename temporary to %s", name1);
return 1;
}
+ if (fdin != -1)
+ close (fdin);
}
else
close_dso_1 (dso);