mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Alexander Monakov <amonakov@ispras.ru>
To: musl@lists.openwall.com
Subject: Re: [PATCH] fix undefined behavior in ptrace
Date: Wed, 5 Jul 2017 00:51:05 +0300 (MSK)	[thread overview]
Message-ID: <alpine.LNX.2.20.13.1707050044310.21060@monopod.intra.ispras.ru> (raw)
In-Reply-To: <20170704211058.GO1627@brightrain.aerifal.cx>

---
On Tue, 4 Jul 2017, Rich Felker wrote:
> Thoughts?

I'm not convinced it's a good idea, given that it's a Linux specific interface,
and the manpage rather explicitly discourages passing fewer than four
arguments.

Plus, handling SPARC-specific differences of argument counts for
PTRACE_{GET,SET}{FP,}REGS would be annoying.

What makes sense is to retrieve the fifth argument only when needed:

 src/linux/ptrace.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/linux/ptrace.c b/src/linux/ptrace.c
index 83b8022b..a3f393d9 100644
--- a/src/linux/ptrace.c
+++ b/src/linux/ptrace.c
@@ -7,14 +7,18 @@ long ptrace(int req, ...)
 {
 	va_list ap;
 	pid_t pid;
-	void *addr, *data, *addr2;
+	void *addr, *data, *addr2 = 0;
 	long ret, result;
 
 	va_start(ap, req);
 	pid = va_arg(ap, pid_t);
 	addr = va_arg(ap, void *);
 	data = va_arg(ap, void *);
-	addr2 = va_arg(ap, void *);
+	/* PTRACE_{READ,WRITE}{DATA,TEXT} (16...19) are specific to SPARC. */
+#ifdef PTRACE_READDATA
+	if ((unsigned)req - PTRACE_READDATA < 4)
+		addr2 = va_arg(ap, void *);
+#endif
 	va_end(ap);
 
 	if (req-1U < 3) data = &result;
-- 
2.11.0



  reply	other threads:[~2017-07-04 21:51 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-28 13:25 Alexander Monakov
2017-06-28 15:13 ` Rich Felker
2017-06-28 15:22   ` Alexander Monakov
2017-07-04 21:10     ` Rich Felker
2017-07-04 21:51       ` Alexander Monakov [this message]
2017-07-04 21:53         ` Rich Felker

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=alpine.LNX.2.20.13.1707050044310.21060@monopod.intra.ispras.ru \
    --to=amonakov@ispras.ru \
    --cc=musl@lists.openwall.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.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

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 NNTP newsgroup(s).