From nobody Mon Feb 21 13:48:54 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6D8241839C6B; Mon, 21 Feb 2022 13:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K2Ntt6vPYz3Pwk; Mon, 21 Feb 2022 13:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645451335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8FJ61n8JnojC6SaANne4UPQHXQAYP+HjM4+qaCHapJ0=; b=UwExz28H5ToPxINKWvyivQlqOX+4S5gX4u9MFJtNJMA+IKq8/quZ6vgmbNXT+ygCkdvkLJ W3ZlRqxGDU8Ov/yFRgmaMbXQ+my3rbZMwp0dkCzKUCXnpaN+X9TCJuWSDNUEh72Rm8Ki8B toX3nmrfnX+ofZQMrDaeV4LDBSqgCkqlqumdG1EwP6espH1fG1Oe7479T0mVQeKGE04sUO zgRnUAs1Iv0bStX97D+QYn4izFyX+gp6Q6d9QRJz5tI8dQdLDbSA0KyaspXuHJfgQn4P8N LSFWz6j4BBKXQ5ibn6yNLTJ15rF05OJWhFoWvwZSvYvH6IwNIvJy7eSsLUMfZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 495EE1168D; Mon, 21 Feb 2022 13:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21LDmsNA091899; Mon, 21 Feb 2022 13:48:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LDmsST091898; Mon, 21 Feb 2022 13:48:54 GMT (envelope-from git) Date: Mon, 21 Feb 2022 13:48:54 GMT Message-Id: <202202211348.21LDmsST091898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 36ff5ce03c63 - stable/13 - linux: Adjust PTRACE_GET_SYSCALL_INFO buffer size semantics List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36ff5ce03c631f4e71fa59a84700a3137b5fdc9b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645451335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8FJ61n8JnojC6SaANne4UPQHXQAYP+HjM4+qaCHapJ0=; b=QRrlV0b5QNVUHmLRhwqBfzWPLxGcn7tlRDO4gke1AOCXkk5iZlQmqWiVlfL2wq3hoECHH6 fdNXonlnGZz9DetmXeeBzJXb11lh4g36WmEIDUTfNYirbN6BlLG/YA04IoqC4htDCcLp3Q SLmUQFGUSUxNX89HIt8l/nYGqT/7abCG/04oD80L6FR0J+dLhXjATGTttmvUwNxZGI/ByS ayBucGB91jF7pKesp7Oyp9Kutrk301F1sayjGA0uxyv+xHS793orgAFsH6cOmpk1nmMdgn A/cFVzdnStFic2MMr5uZrLbP5OlQCjVZ5jQna1SruuUv7VO2VQJcNCA379OUig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645451335; a=rsa-sha256; cv=none; b=sKOtdMPyVBFsQz3lvBNBw7XfO4gpS4zPm8V649CJgKqpEYa+w5jJQbAoHRIS6O4tm4Mfi8 dTIGp+96Y6Ss2Yle6O/OLCd6rMKTEryETzgoVeN348QUJHrwUI+uK0fh8jUorEvs44XtvI 1tqtb9VPbhKG83B2OV/H2VidACobeWms55ynOCRJbucttbtDRqRQUo4HPOmDXmtmhZRyeh n7v7RQiBPyR8kbOx/e0fa3n6CHwoJgI35mI230McNFjqelQ8yJuLpPilJls9u5F1f/bwlL IZYgFHvHw2AznsZ0zXjeZk+2iCkMLmzCHdmwoGuet6unOtzS3jXfmC0WEFJjPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=36ff5ce03c631f4e71fa59a84700a3137b5fdc9b commit 36ff5ce03c631f4e71fa59a84700a3137b5fdc9b Author: Edward Tomasz Napierala AuthorDate: 2021-10-17 10:49:42 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-21 13:34:44 +0000 linux: Adjust PTRACE_GET_SYSCALL_INFO buffer size semantics The tests/ptrace_syscall_info test from strace(1) complained about this. Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D32368 (cherry picked from commit 75a9d95b4d0a043ac0f3f8d1efc0982156337eac) --- sys/amd64/linux/linux_ptrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux/linux_ptrace.c b/sys/amd64/linux/linux_ptrace.c index a29a3310dfcd..cccef2ad5461 100644 --- a/sys/amd64/linux/linux_ptrace.c +++ b/sys/amd64/linux/linux_ptrace.c @@ -558,7 +558,7 @@ linux_ptrace_seize(struct thread *td, pid_t pid, l_ulong addr, l_ulong data) static int linux_ptrace_get_syscall_info(struct thread *td, pid_t pid, - l_ulong addr, l_ulong data) + l_ulong len, l_ulong data) { struct ptrace_lwpinfo lwpinfo; struct ptrace_sc_ret sr; @@ -623,7 +623,8 @@ linux_ptrace_get_syscall_info(struct thread *td, pid_t pid, si.instruction_pointer = b_reg.r_rip; si.stack_pointer = b_reg.r_rsp; - error = copyout(&si, (void *)data, sizeof(si)); + len = MIN(len, sizeof(si)); + error = copyout(&si, (void *)data, len); if (error == 0) td->td_retval[0] = sizeof(si);