From nobody Wed Jan 3 21:54:24 2024 X-Original-To: dev-commits-ports-all@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 4T53Qm58KMz56n9D; Wed, 3 Jan 2024 21:54:24 +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 4T53Qm4cgNz4XN8; Wed, 3 Jan 2024 21:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704318864; 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=lkdrkySAP6SBBKPWGM/6meYZaaLeInvr0hvuhm5Js/g=; b=hBLZLX8qJJtL1QFkzXvqG4x8+dd0tqPdw6hWLpzeOiZw5O9jj7Tn0+JAaSayx/hSe9WOZk Ob2jqQIf5rdRC9jQbef/HZ8wnFItjn5E1kmuJfaNfbfu+JMSnlR+8uVfqjsk+w1BqRBlAo ZM17PrCeW314/gQqZiJ1RkGfgAsMY05dsyNOx0JF9w/+GcfTkWLkHgpWRGUhDp2a6gOTC/ /BptKACNoU9Mz7A6rlbT/ARajUTMyiKU6RgHl1LD59iNFzwbQwZ4ptyqNG0G9mxpaqlLjM q+B68uqatVBQbInH8diTHMAw0hQi/2dMinre1pjrcHiPAVhWrIqbi9YZdWFa1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704318864; 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=lkdrkySAP6SBBKPWGM/6meYZaaLeInvr0hvuhm5Js/g=; b=cGUjgiWdTqmHjLmEHxpvlcuVcXSEXm97K1K7lYxbIFvXavvkDFDCT+HDpY9D9LuqPsogef pqtN3j1VhOyKl0o/uOFKtgDAHkVMojzwZx187Wpy5eLJGbgSSxPoHs/BI+4FQvxv6F1XAP T9xPi3dEd5JjcGX1UVuqSCroRo+whW70c6k8u2raTlcvzhZtcqB9n8+zvvpV8OQ2aHtJcu 8vMxb1KmdE3fesodorSDPDSI4VJzUmaaSmmYgKos60w7N5sTxNK/lCCwNE1VN6DirxI0rQ L3VNhMezsPifRd3Pq2Rtz2dBNcMA8+O3jgkrnpbG6c0qzDvow3vdixTuLD6uTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704318864; a=rsa-sha256; cv=none; b=gsx7AzF+LkyC3h9Q3cpouFnSgZVnX89FfZ2v8dihhIWzhf1YDo9+YPj8DaxB9HmYaXnaX2 A6Y8LyE5+qINs5JnVRtN16i4rBwqaAZnnegVRgcCVaXYGUBCJC/E5htiTTqj6ZsPOB5q7Y Yi6GLADTIxdC/p/ZuBFYe3FtVTn3aAUF8dozEk3nnWg3lHTNjgHCvnxiUYK86bI5f5z+xO SK/Ss6n2QbKNRLbcSJvh2Xgusq2pXaBupZMBmNXZaWQ42cO9SIv9uAXgthBjvn64QhAnit gZL2189dy6Hl6UOO5AkGPWQAyWqbX9qK+MpvxIAZjWpOeS+xVgV9W6/peJ+g8g== 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 4T53Qm3flwz12Vg; Wed, 3 Jan 2024 21:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403LsOQo054473; Wed, 3 Jan 2024 21:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403LsOm5054470; Wed, 3 Jan 2024 21:54:24 GMT (envelope-from git) Date: Wed, 3 Jan 2024 21:54:24 GMT Message-Id: <202401032154.403LsOm5054470@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Johnston Subject: git: d0d5a75f66a4 - main - sysutils/acpi_call: Check for errors from copyout() List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0d5a75f66a400f72b5206debdf60ca5fa05da53 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0d5a75f66a400f72b5206debdf60ca5fa05da53 commit d0d5a75f66a400f72b5206debdf60ca5fa05da53 Author: Mark Johnston AuthorDate: 2024-01-02 18:18:53 +0000 Commit: Mark Johnston CommitDate: 2024-01-03 21:53:33 +0000 sysutils/acpi_call: Check for errors from copyout() The base system will soon require all copyout() calls to either preserve the return value or explicitly ignore it. PR: 275986 Approved by: antoine --- sysutils/acpi_call/Makefile | 2 +- sysutils/acpi_call/files/patch-acpi__call.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sysutils/acpi_call/Makefile b/sysutils/acpi_call/Makefile index b56ff57106a8..0b2b810542a9 100644 --- a/sysutils/acpi_call/Makefile +++ b/sysutils/acpi_call/Makefile @@ -1,6 +1,6 @@ PORTNAME= acpi_call PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://projects.ukrweb.net/files/ \ http://imax.in.ua/files/ diff --git a/sysutils/acpi_call/files/patch-acpi__call.c b/sysutils/acpi_call/files/patch-acpi__call.c index 39d1785bae2d..a278233a969e 100644 --- a/sysutils/acpi_call/files/patch-acpi__call.c +++ b/sysutils/acpi_call/files/patch-acpi__call.c @@ -12,7 +12,7 @@ #include #if __FreeBSD__ >= 8 # include -@@ -45,18 +45,97 @@ +@@ -45,18 +45,99 @@ void acpi_call_fixup_pointers(ACPI_OBJECT *p, UINT8 *o void acpi_call_fixup_pointers(ACPI_OBJECT *p, UINT8 *orig); @@ -95,7 +95,9 @@ + ACPI_OBJECT_LIST *args; ACPI_BUFFER result; + char path[256]; ++ int error; ++ error = 0; result.Length = ACPI_ALLOCATE_BUFFER; result.Pointer = NULL; @@ -111,13 +113,14 @@ if (ACPI_SUCCESS(params->retval)) { if (result.Pointer != NULL) -@@ -64,30 +143,31 @@ acpi_call_ioctl(u_long cmd, caddr_t addr, void *arg) +@@ -64,30 +145,31 @@ acpi_call_ioctl(u_long cmd, caddr_t addr, void *arg) if (params->result.Pointer != NULL) { params->result.Length = min(params->result.Length, result.Length); +- copyout(result.Pointer, params->result.Pointer, + if (result.Length >= sizeof(ACPI_OBJECT)) + acpi_call_fixup_pointers((ACPI_OBJECT*)result.Pointer, params->result.Pointer); - copyout(result.Pointer, params->result.Pointer, ++ error = copyout(result.Pointer, params->result.Pointer, params->result.Length); params->reslen = result.Length; - if (result.Length >= sizeof(ACPI_OBJECT)) @@ -129,7 +132,8 @@ + free_acpi_object_list(args); } - return (0); +- return (0); ++ return error; } void