Re: [PATCH] Fix check for strippable relocation section.

[Mark Wielaard <mjw at redhat dot com>]

Hi Nick,

On Thu, 2012-10-11 at 13:19 +0100, Nick Alcock wrote:
> On 11 Oct 2012, Mark Wielaard said:
> > Grin, yeah. I have been straining myself to not just recreate the fix
> > from scratch (writing this email is probably more work). Because I
> > think it is better to have someone blocked on something this simple than
> > have them being blocked in the future when they have something more
> > substantial. Lets see if Nick can get something good out of his legal
> > department. After that all future contributions should come "for free".
> > Nick please let us know if things look hopeless then we can certainly
> > just write a very similar fix ourselves. I have it on my list to double
> > check before we do a new release.
> 
> Things do definitely not look hopeless: there was a communications
> screwup and nobody had actually talked to the legal dept at all
> (everyone was deadlocked waiting for someone else). Given that numerous
> people in the same dept are Fedora maintainers of long standing, I'm
> reasonably certain that I will be allowed to sign the thing soon!

Sorry I rewrote the patch for now, since I didn't want to miss it going
in before the next release (it missed the last one). So I pushed the
attached.

Cheers,

Mark

>From 2cfec29465e4d1882256f85eb92bbde4a9bdedbe Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Wed, 25 Sep 2013 13:02:53 +0200
Subject: [PATCH] eblsectionstripp.c (ebl_section_strip_p): Check shdr_l is not NULL.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---
 libebl/ChangeLog          |    4 ++++
 libebl/eblsectionstripp.c |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libebl/ChangeLog b/libebl/ChangeLog
index 78f6b69..623bdba 100644
--- a/libebl/ChangeLog
+++ b/libebl/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-25  Mark Wielaard  <mjw@redhat.com>
+
+	* eblsectionstripp.c (ebl_section_strip_p): Check shdr_l is not NULL.
+
 2013-04-24  Mark Wielaard  <mjw@redhat.com>
 
 	* Makefile.am: Use AM_CPPFLAGS instead of INCLUDES.
diff --git a/libebl/eblsectionstripp.c b/libebl/eblsectionstripp.c
index 9497068..c6cda63 100644
--- a/libebl/eblsectionstripp.c
+++ b/libebl/eblsectionstripp.c
@@ -1,5 +1,5 @@
 /* Check whether section can be stripped.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2013 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@ ebl_section_strip_p (Ebl *ebl, const GElf_Ehdr *ehdr, const GElf_Shdr *shdr,
 	  Elf_Scn *scn_l = elf_getscn (ebl->elf, (shdr)->sh_info);
 	  GElf_Shdr shdr_mem_l;
 	  GElf_Shdr *shdr_l = gelf_getshdr (scn_l, &shdr_mem_l);
-	  if (shdr_l == NULL)
+	  if (shdr_l != NULL)
 	    {
 	      const char *s_l = elf_strptr (ebl->elf, ehdr->e_shstrndx,
 					    shdr_l->sh_name);
-- 
1.7.1