From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1551) id 166453857806; Thu, 14 Apr 2022 19:23:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 166453857806 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Pedro Alves To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdbserver: special case target_write_memory len==0 X-Act-Checkin: binutils-gdb X-Git-Author: Pedro Alves X-Git-Refname: refs/heads/master X-Git-Oldrev: 330d63093c562a4b221835832c5e4f767dc623c3 X-Git-Newrev: 366e3746c572c2c78454761e62fa9181cba413ca Message-Id: <20220414192314.166453857806@sourceware.org> Date: Thu, 14 Apr 2022 19:23:14 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2022 19:23:14 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D366e3746c572= c2c78454761e62fa9181cba413ca commit 366e3746c572c2c78454761e62fa9181cba413ca Author: Pedro Alves Date: Thu Mar 31 22:04:42 2022 +0100 gdbserver: special case target_write_memory len=3D=3D0 =20 The next patch in this series adds a common helper routine for both memory reads and writes, like this: =20 static int proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf, const gdb_byte *writebuf, int len) { gdb_assert ((readbuf =3D=3D nullptr) !=3D (writebuf =3D=3D nullptr)); ... } =20 int linux_process_target::read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) { return proc_xfer_memory (memaddr, myaddr, nullptr, len); } =20 linux_process_target::write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int le= n) { return proc_xfer_memory (memaddr, nullptr, myaddr, len); } =20 Surprisingly, the assertion fails. That happens because it can happen that target_write_memory is called with LEN=3D=3D0, due to this in gdb/remote.c: =20 /* Determine whether the remote target supports binary downloading. This is accomplished by sending a no-op memory write of zero length to the target at the specified address. (...) */ =20 void remote_target::check_binary_download (CORE_ADDR addr) { ... p =3D rs->buf.data (); *p++ =3D 'X'; p +=3D hexnumstr (p, (ULONGEST) addr); *p++ =3D ','; p +=3D hexnumstr (p, (ULONGEST) 0); *p++ =3D ':'; *p =3D '\0'; =20 In this scenario, in gdbserver's target_write_memory, the "myaddr" argument of the_target->write_memory is passed the data() of a local gdb::byte_vector (which is a specialized std::vector). It's valid for std::vector::data() to return NULL when the vector is empty. =20 This commit adds an early return to target_write_memory to avoid target backends having to care about this. For good measure, do the same on the read side, in read_inferior_memory. =20 Change-Id: Iac8f04fcf99014c624ef4036bd318ca1771ad491 Diff: --- gdbserver/target.cc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 5009146d663..e9d1e1aa38c 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -124,8 +124,14 @@ done_accessing_memory (void) int read_inferior_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) { - int res; - res =3D the_target->read_memory (memaddr, myaddr, len); + /* At the time of writing, GDB only sends write packets with LEN=3D=3D0, + not read packets (see comment in target_write_memory), but it + doesn't hurt to prevent problems if it ever does, or we're + connected to some client other than GDB that does. */ + if (len =3D=3D 0) + return 0; + + int res =3D the_target->read_memory (memaddr, myaddr, len); check_mem_read (memaddr, myaddr, len); return res; } @@ -152,6 +158,13 @@ int target_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, ssize_t len) { + /* GDB may send X packets with LEN=3D=3D0, for probing packet support. + If we let such a request go through, then buffer.data() below may + return NULL, which may confuse target implementations. Handle it + here to avoid lower levels having to care about this case. */ + if (len =3D=3D 0) + return 0; + /* Make a copy of the data because check_mem_write may need to update it. */ gdb::byte_vector buffer (myaddr, myaddr + len);