public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Simon Marchi <simark@simark.ca>
To: Tom Tromey <tom@tromey.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH] Fix crash in gdbpy_parse_register_id
Date: Wed, 27 Apr 2022 21:45:42 -0400	[thread overview]
Message-ID: <80873420-8a71-111f-453c-f354381e0ad3@simark.ca> (raw)
In-Reply-To: <20220427212742.4003557-1-tom@tromey.com>

> @@ -417,6 +423,8 @@ gdbpy_parse_register_id (struct gdbarch *gdbarch, PyObject *pyo_reg_id,
>  	PyErr_SetString (PyExc_ValueError,
>  			 _("Invalid Architecture in RegisterDescriptor"));
>      }
> +  else
> +    PyErr_SetString (PyExc_ValueError, _("Invalid type for register"));

I think this one should be a TypeError.  We could argue that it is an
API break to change the exception type thrown when passing an argument
with the wrong type, but given that it previously crashed GDB, I don't
think anybody is relying on it.

> diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
> index b2fd1402e93..e2cd67a0785 100644
> --- a/gdb/python/py-unwind.c
> +++ b/gdb/python/py-unwind.c
> @@ -262,10 +262,7 @@ unwind_infopy_add_saved_register (PyObject *self, PyObject *args)
>  			  &pyo_reg_id, &pyo_reg_value))
>      return NULL;
>    if (!gdbpy_parse_register_id (pending_frame->gdbarch, pyo_reg_id, &regnum))
> -    {
> -      PyErr_SetString (PyExc_ValueError, "Bad register");
> -      return NULL;
> -    }
> +    return NULL;
>  
>    /* If REGNUM identifies a user register then *maybe* we can convert this
>       to a real (i.e. non-user) register.  The maybe qualifier is because we
> @@ -383,10 +380,7 @@ pending_framepy_read_register (PyObject *self, PyObject *args)
>    if (!PyArg_UnpackTuple (args, "read_register", 1, 1, &pyo_reg_id))
>      return NULL;
>    if (!gdbpy_parse_register_id (pending_frame->gdbarch, pyo_reg_id, &regnum))
> -    {
> -      PyErr_SetString (PyExc_ValueError, "Bad register");
> -      return NULL;
> -    }
> +    PyErr_SetString (PyExc_ValueError, "Bad register");

It seems like you kept the wrong line here?  If this is really an error
and no test has caught this, it means we're lacking some coverage.

>  
>    try
>      {
> diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
> index d947b96033b..dffcd3f1b7f 100644
> --- a/gdb/python/python-internal.h
> +++ b/gdb/python/python-internal.h
> @@ -799,7 +799,8 @@ typedef std::unique_ptr<Py_buffer, Py_buffer_deleter> Py_buffer_up;
>  
>     If a register is parsed successfully then *REG_NUM will have been
>     updated, and true is returned.  Otherwise the contents of *REG_NUM are
> -   undefined, and false is returned.
> +   undefined, and false is returned.  When false is returned, the
> +   Python error is set.
>  
>     The PYO_REG_ID object can be a string, the name of the register.  This
>     is the slowest approach as GDB has to map the name to a number for each
> diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
> index b91ffe62a83..881219342e3 100644
> --- a/gdb/testsuite/gdb.python/py-frame.exp
> +++ b/gdb/testsuite/gdb.python/py-frame.exp
> @@ -128,3 +128,8 @@ if { $pc != "" } {
>  	" = True" \
>  	"test Frame.read_register($pc)"
>  }
> +
> +# This previously caused a crash.

This comment is a bit too broad, can you make it a bit more precise?
What is it we are testing exactly?  I suppose "passing an object with an
unexpected type to read_register".

Simon

  reply	other threads:[~2022-04-28  1:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-27 21:27 Tom Tromey
2022-04-28  1:45 ` Simon Marchi [this message]
2022-04-28  2:11   ` Tom Tromey
2022-06-11 17:38   ` Tom Tromey
2022-08-21 14:01     ` Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=80873420-8a71-111f-453c-f354381e0ad3@simark.ca \
    --to=simark@simark.ca \
    --cc=gdb-patches@sourceware.org \
    --cc=tom@tromey.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).