0.173-4 - Add elfutils-0.173-elfcompress.patch (#1607044)
This commit is contained in:
Mark Wielaard
parent
b28c213777
commit
15973e2b9b
136
elfutils-0.173-elfcompress.patch
Normal file
136
elfutils-0.173-elfcompress.patch
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
commit 47499e57d9321f4e45f33a3c1ab12264510ee7a4
|
||||||
|
Author: Mark Wielaard <mark@klomp.org>
|
||||||
|
Date: Sat Jul 21 16:10:25 2018 +0200
|
||||||
|
|
||||||
|
elfcompress: Swap fchmod and fchown calls on new file.
|
||||||
|
|
||||||
|
Calling fchmod with a suid bit on a file might silently fail or the suid
|
||||||
|
bit might be slilently cleared by a call to fchown if already set. Swap
|
||||||
|
the calls so that the owner is set first and then set the suid bit.
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1607044
|
||||||
|
|
||||||
|
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
||||||
|
|
||||||
|
diff --git a/src/elfcompress.c b/src/elfcompress.c
|
||||||
|
index bdb0e3b..1a0f984 100644
|
||||||
|
--- a/src/elfcompress.c
|
||||||
|
+++ b/src/elfcompress.c
|
||||||
|
@@ -1235,13 +1235,16 @@ process_file (const char *fname)
|
||||||
|
elf_end (elfnew);
|
||||||
|
elfnew = NULL;
|
||||||
|
|
||||||
|
- /* Try to match mode and owner.group of the original file. */
|
||||||
|
- if (fchmod (fdnew, st.st_mode & ALLPERMS) != 0)
|
||||||
|
- if (verbose >= 0)
|
||||||
|
- error (0, errno, "Couldn't fchmod %s", fnew);
|
||||||
|
+ /* Try to match mode and owner.group of the original file.
|
||||||
|
+ Note to set suid bits we have to make sure the owner is setup
|
||||||
|
+ correctly first. Otherwise fchmod will drop them silently
|
||||||
|
+ or fchown may clear them. */
|
||||||
|
if (fchown (fdnew, st.st_uid, st.st_gid) != 0)
|
||||||
|
if (verbose >= 0)
|
||||||
|
error (0, errno, "Couldn't fchown %s", fnew);
|
||||||
|
+ if (fchmod (fdnew, st.st_mode & ALLPERMS) != 0)
|
||||||
|
+ if (verbose >= 0)
|
||||||
|
+ error (0, errno, "Couldn't fchmod %s", fnew);
|
||||||
|
|
||||||
|
/* Finally replace the old file with the new file. */
|
||||||
|
if (foutput == NULL)
|
||||||
|
|
||||||
|
commit d676c839e783996409d7845ea236e0883a827cbb
|
||||||
|
Author: Mark Wielaard <mark@klomp.org>
|
||||||
|
Date: Sat Jul 21 17:07:12 2018 +0200
|
||||||
|
|
||||||
|
elfcompress: Don't rewrite file if no section data needs to be updated.
|
||||||
|
|
||||||
|
If the input and output file are the same and no section needs to
|
||||||
|
be updated we really don't need to rewrite the file. Check whether
|
||||||
|
any matching section is already compressed or (GNU) decompressed.
|
||||||
|
Skip the section if it doesn't need to be changed. If no section data
|
||||||
|
needs updating end with success without rewriting/updating file.
|
||||||
|
With --force the file will still always be updated/rewritten even if
|
||||||
|
no section data needs to be (de)compressed.
|
||||||
|
|
||||||
|
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
||||||
|
|
||||||
|
diff --git a/src/elfcompress.c b/src/elfcompress.c
|
||||||
|
index 1a0f984..ae4708c 100644
|
||||||
|
--- a/src/elfcompress.c
|
||||||
|
+++ b/src/elfcompress.c
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* Compress or decompress an ELF file.
|
||||||
|
- Copyright (C) 2015, 2016 Red Hat, Inc.
|
||||||
|
+ Copyright (C) 2015, 2016, 2018 Red Hat, Inc.
|
||||||
|
This file is part of elfutils.
|
||||||
|
|
||||||
|
This file is free software; you can redistribute it and/or modify
|
||||||
|
@@ -286,6 +286,15 @@ process_file (const char *fname)
|
||||||
|
return (sections[ndx / WORD_BITS] & (1U << (ndx % WORD_BITS))) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* How many sections are we going to change? */
|
||||||
|
+ size_t get_sections (void)
|
||||||
|
+ {
|
||||||
|
+ size_t s = 0;
|
||||||
|
+ for (size_t i = 0; i < shnum / WORD_BITS + 1; i++)
|
||||||
|
+ s += __builtin_popcount (sections[i]);
|
||||||
|
+ return s;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
int cleanup (int res)
|
||||||
|
{
|
||||||
|
elf_end (elf);
|
||||||
|
@@ -422,6 +431,9 @@ process_file (const char *fname)
|
||||||
|
names change and whether there is a symbol table that might need
|
||||||
|
to be adjusted be if the section header name table is changed.
|
||||||
|
|
||||||
|
+ If nothing needs changing, and the input and output file are the
|
||||||
|
+ same, we are done.
|
||||||
|
+
|
||||||
|
Second a collection pass that creates the Elf sections and copies
|
||||||
|
the data. This pass will compress/decompress section data when
|
||||||
|
needed. And it will collect all data needed if we'll need to
|
||||||
|
@@ -464,7 +476,26 @@ process_file (const char *fname)
|
||||||
|
|
||||||
|
if (section_name_matches (sname))
|
||||||
|
{
|
||||||
|
- if (shdr->sh_type != SHT_NOBITS
|
||||||
|
+ if (!force && type == T_DECOMPRESS
|
||||||
|
+ && (shdr->sh_flags & SHF_COMPRESSED) == 0
|
||||||
|
+ && strncmp (sname, ".zdebug", strlen (".zdebug")) != 0)
|
||||||
|
+ {
|
||||||
|
+ if (verbose > 0)
|
||||||
|
+ printf ("[%zd] %s already decompressed\n", ndx, sname);
|
||||||
|
+ }
|
||||||
|
+ else if (!force && type == T_COMPRESS_ZLIB
|
||||||
|
+ && (shdr->sh_flags & SHF_COMPRESSED) != 0)
|
||||||
|
+ {
|
||||||
|
+ if (verbose > 0)
|
||||||
|
+ printf ("[%zd] %s already compressed\n", ndx, sname);
|
||||||
|
+ }
|
||||||
|
+ else if (!force && type == T_COMPRESS_GNU
|
||||||
|
+ && strncmp (sname, ".zdebug", strlen (".zdebug")) == 0)
|
||||||
|
+ {
|
||||||
|
+ if (verbose > 0)
|
||||||
|
+ printf ("[%zd] %s already GNU compressed\n", ndx, sname);
|
||||||
|
+ }
|
||||||
|
+ else if (shdr->sh_type != SHT_NOBITS
|
||||||
|
&& (shdr->sh_flags & SHF_ALLOC) == 0)
|
||||||
|
{
|
||||||
|
set_section (ndx);
|
||||||
|
@@ -518,6 +549,14 @@ process_file (const char *fname)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (foutput == NULL && get_sections () == 0)
|
||||||
|
+ {
|
||||||
|
+ if (verbose > 0)
|
||||||
|
+ printf ("Nothing to do.\n");
|
||||||
|
+ fnew = NULL;
|
||||||
|
+ return cleanup (0);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (adjust_names)
|
||||||
|
{
|
||||||
|
names = dwelf_strtab_init (true);
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Name: elfutils
|
Name: elfutils
|
||||||
Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
|
Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
|
||||||
Version: 0.173
|
Version: 0.173
|
||||||
%global baserelease 3
|
%global baserelease 4
|
||||||
URL: http://elfutils.org/
|
URL: http://elfutils.org/
|
||||||
%global source_url ftp://sourceware.org/pub/elfutils/%{version}/
|
%global source_url ftp://sourceware.org/pub/elfutils/%{version}/
|
||||||
License: GPLv3+ and (GPLv2+ or LGPLv3+)
|
License: GPLv3+ and (GPLv2+ or LGPLv3+)
|
||||||
@ -21,6 +21,7 @@ Source: %{?source_url}%{name}-%{version}.tar.bz2
|
|||||||
|
|
||||||
# Patches
|
# Patches
|
||||||
Patch1: elfutils-0.173-new-notes-hack.patch
|
Patch1: elfutils-0.173-new-notes-hack.patch
|
||||||
|
Patch2: elfutils-0.173-elfcompress.patch
|
||||||
|
|
||||||
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
|
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
|
||||||
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
|
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
|
||||||
@ -190,6 +191,7 @@ profiling) of processes.
|
|||||||
|
|
||||||
# Apply patches
|
# Apply patches
|
||||||
%patch1 -p1 -b .notes_hack
|
%patch1 -p1 -b .notes_hack
|
||||||
|
%patch2 -p1 -b .elfcompress
|
||||||
|
|
||||||
# In case the above patches added any new test scripts, make sure they
|
# In case the above patches added any new test scripts, make sure they
|
||||||
# are executable.
|
# are executable.
|
||||||
@ -322,6 +324,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jul 21 2018 Mark Wielaard <mjw@fedoraproject.org> - 0.173-4
|
||||||
|
- Add elfutils-0.173-elfcompress.patch (#1607044)
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.173-3
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.173-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user