diff mbox

[RFA/commit] rs6000-tdep.c:skip_prologue avoid negative left shift

Message ID 1539383206-81457-1-git-send-email-brobecker@adacore.com
State New
Headers show

Commit Message

Joel Brobecker Oct. 12, 2018, 10:26 p.m. UTC
the rs6000-tdep.c::skip_prologue function has the following code:

          unsigned int all_mask = ~((1U << fdata->saved_gpr) - 1);

          /* Not a recognized prologue instruction.
             Handle optimizer code motions into the prologue by continuing
             the search if we have no valid frame yet or if the return
             address is not yet saved in the frame.  Also skip instructions
             if some of the GPRs expected to be saved are not yet saved.  */
          if (fdata->frameless == 0 && fdata->nosavedpc == 0
              && (fdata->gpr_mask & all_mask) == all_mask)
            break;

The problem is that fdata->saved_gpr is initialized to -1, and so,
if no instruction is found in the function's prologue that causes us
to set that field to a non-negative value, the sanitizer crashes
with the following message:

    rs6000-tdep.c:1965:34: runtime error: shift exponent -1 is negative

This patch fixes the issue the by only doing the shift if saved_gpr
is not negative. When saved_gpr is negative, we actually don't need
the shift.

gdb/ChangeLog:

        * rs6000-tdep.c (skip_prologue): Fix potential negative left
        shifting.

Tested on ppc-linux native.
Also tested on ppc-elf (baremetal) using AdaCore's testsuite.

I will commit in a couple of weeks unless there are objections.

Thanks,

Comments

Kevin Buettner Oct. 13, 2018, 4:26 a.m. UTC | #1
On Fri, 12 Oct 2018 18:26:46 -0400
Joel Brobecker <brobecker@adacore.com> wrote:

> gdb/ChangeLog:
> 
>         * rs6000-tdep.c (skip_prologue): Fix potential negative left
>         shifting.

LGTM.

Kevin
Joel Brobecker Nov. 1, 2018, 9:47 p.m. UTC | #2
> > gdb/ChangeLog:
> > 
> >         * rs6000-tdep.c (skip_prologue): Fix potential negative left
> >         shifting.
> 
> LGTM.

Thanks Kevin. I finally took the time to push this patch in.
diff mbox

Patch

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index ce01be5..45dffbe 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -1962,16 +1962,19 @@  skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 
       else
 	{
-	  unsigned int all_mask = ~((1U << fdata->saved_gpr) - 1);
-
 	  /* Not a recognized prologue instruction.
 	     Handle optimizer code motions into the prologue by continuing
 	     the search if we have no valid frame yet or if the return
 	     address is not yet saved in the frame.  Also skip instructions
 	     if some of the GPRs expected to be saved are not yet saved.  */
 	  if (fdata->frameless == 0 && fdata->nosavedpc == 0
-	      && (fdata->gpr_mask & all_mask) == all_mask)
-	    break;
+	      && fdata->saved_gpr != -1)
+	    {
+	      unsigned int all_mask = ~((1U << fdata->saved_gpr) - 1);
+
+	      if ((fdata->gpr_mask & all_mask) == all_mask)
+		break;
+	    }
 
 	  if (op == 0x4e800020		/* blr */
 	      || op == 0x4e800420)	/* bctr */