fix bug 2603717. Ensure all elf program headers are copied.android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1linaro_android_2.3.3gingerbread-releasegingerbread-mr4-releasegingerbread

When stripping a binary, soslim calls adjust_elf.  adjust_elf
copies over the elf program headers, making adjustments
as necessary.  Under some circumstances, the code which loops
over all the program headers will fail to call gelf_update_phdr().
Instead of copying over the elf program header from the old
binary to the new binary, a "NULL" header is written to the
binary.

Change-Id: I7afdc8e3af2638c386546f1bfe4f151e1f002087

1 files changed, 2 insertions, 0 deletions

diff --git a/elfcopy.c b/elfcopy.c
index 1a32a59..ed1e6ce 100644
--- a/elfcopy.c
+++ b/elfcopy.c
@@ -1057,6 +1057,8 @@ void adjust_elf(Elf *elf, const char *elf_name,
                         INFO("PT_ header type: %d does not contain any sections.\n",
                                phdr_info[pi].p_type);
                         /* Move to the next program header. */
+                        FAILIF_LIBELF(gelf_update_phdr (newelf, pi, &phdr_info[pi]) == 0,
+                                      gelf_update_phdr);
                         continue;
                     }