CVS commit: src/sys/external/bsd/acpica/dist/namespace
Module Name:src
Committed By: chs
Date: Sun May 30 16:25:35 UTC 2021
Modified Files:
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c
Log Message:
avoid dereferencing a constant string address as a UINT32 pointer,
KUBSAN complains about bad alignment.
Reported-by: syzbot+91187f4e33436ce83...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.20 src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.21
--- src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.20 Sat Apr 3 17:45:03 2021
+++ src/sys/external/bsd/acpica/dist/namespace/nsaccess.c Sun May 30 16:25:35 2021
@@ -79,6 +79,7 @@ AcpiNsRootInitialize (
ACPI_NAMESPACE_NODE *PrevNode = NULL;
ACPI_OPERAND_OBJECT *ObjDesc;
ACPI_STRING Val = NULL;
+UINT32 Name;
ACPI_FUNCTION_TRACE (NsRootInitialize);
@@ -143,7 +144,8 @@ AcpiNsRootInitialize (
* predefined names are at the root level. It is much easier to
* just create and link the new node(s) here.
*/
-NewNode = AcpiNsCreateNode (*ACPI_CAST_PTR (UINT32, InitVal->Name));
+memcpy(&Name, InitVal->Name, sizeof(Name));
+NewNode = AcpiNsCreateNode (Name);
if (!NewNode)
{
Status = AE_NO_MEMORY;
CVS commit: src/sys/external/bsd/acpica/dist/namespace
Module Name:src Committed By: chs Date: Mon Feb 9 03:16:33 UTC 2015 Modified Files: src/sys/external/bsd/acpica/dist/namespace: nsinit.c Log Message: revert rev 1.5, which brings back PR 48494. that earlier revision itself reverted an upstream bugfix, and that change fixed some systems but broke others (in particular, it broke my HP Z800 workstation.) this latest revision brings us back in sync with upstream. the current upstream (and this latest flip-flop of our copy) is clearly correct, since it zeros a buffer which is intended to be used as scratch space for a single acpica operation. agreed by christos and ryoon back in april 2014. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/namespace/nsinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/acpica/dist/namespace/nsinit.c diff -u src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.6 src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.7 --- src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.6 Sat Oct 25 21:00:07 2014 +++ src/sys/external/bsd/acpica/dist/namespace/nsinit.c Mon Feb 9 03:16:33 2015 @@ -616,10 +616,7 @@ AcpiNsInitOneDevice ( ACPI_DEBUG_EXEC (AcpiUtDisplayInitPathname ( ACPI_TYPE_METHOD, DeviceNode, METHOD_NAME__INI)); -#if 0 -// https://bugs.acpica.org/show_bug.cgi?id=1016 ACPI_MEMSET (Info, 0, sizeof (ACPI_EVALUATE_INFO)); -#endif Info->PrefixNode = DeviceNode; Info->RelativePathname = __UNCONST(METHOD_NAME__INI); Info->Parameters = NULL;
CVS commit: src/sys/external/bsd/acpica/dist/namespace
Module Name:src Committed By: christos Date: Sun Jan 5 15:45:43 UTC 2014 Modified Files: src/sys/external/bsd/acpica/dist/namespace: nsinit.c Log Message: PR/48494: Ryo Onodera: After ACPICA 20131218 update, uhub topology is misanderstood on macbook air. Ryo by bisection found that the following commit causes the problem: https://github.com/acpica/acpica/commit/\ 637accd073a205eb4acac935f34d0eaee0c301a8. This is tracked in: https://bugs.acpica.org/show_bug.cgi?id=1016 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/namespace/nsinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/acpica/dist/namespace/nsinit.c diff -u src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.4 src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.5 --- src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.4 Fri Dec 27 13:50:57 2013 +++ src/sys/external/bsd/acpica/dist/namespace/nsinit.c Sun Jan 5 10:45:43 2014 @@ -618,7 +618,10 @@ AcpiNsInitOneDevice ( ACPI_DEBUG_EXEC (AcpiUtDisplayInitPathname ( ACPI_TYPE_METHOD, DeviceNode, METHOD_NAME__INI)); +#if 0 +// https://bugs.acpica.org/show_bug.cgi?id=1016 ACPI_MEMSET (Info, 0, sizeof (ACPI_EVALUATE_INFO)); +#endif Info->PrefixNode = DeviceNode; Info->RelativePathname = __UNCONST(METHOD_NAME__INI); Info->Parameters = NULL;
