1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
--- acpi_call.c.orig 2011-11-07 05:35:10 UTC
+++ acpi_call.c
@@ -29,10 +29,10 @@
*/
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/module.h>
#include <sys/systm.h>
#include <sys/errno.h>
-#include <sys/param.h>
#include <sys/kernel.h>
#if __FreeBSD__ >= 8
# include <contrib/dev/acpica/include/acpi.h>
@@ -45,18 +45,99 @@ void acpi_call_fixup_pointers(ACPI_OBJECT *p, UINT8 *o
void acpi_call_fixup_pointers(ACPI_OBJECT *p, UINT8 *orig);
+static void
+free_acpi_object_list(ACPI_OBJECT_LIST *list)
+{
+ for (int i = 0; i < list->Count; i++) {
+ switch (list->Pointer[i].Type) {
+ case ACPI_TYPE_STRING:
+ AcpiOsFree(list->Pointer[i].String.Pointer);
+ break;
+ case ACPI_TYPE_BUFFER:
+ AcpiOsFree(list->Pointer[i].Buffer.Pointer);
+ break;
+ default:
+ break;
+ }
+ }
+ AcpiOsFree(list);
+}
+
+static ACPI_OBJECT_LIST *
+copyin_acpi_object_list(ACPI_OBJECT_LIST *src)
+{
+ ACPI_OBJECT_LIST *dest;
+ bool failed;
+
+ if (src->Count > 7)
+ return NULL;
+
+ dest = AcpiOsAllocate(sizeof(ACPI_OBJECT_LIST) + sizeof(ACPI_OBJECT) * src->Count);
+ if (!dest)
+ return NULL;
+
+ dest->Count = src->Count;
+ dest->Pointer = (ACPI_OBJECT *)(dest + 1);
+ if (copyin(src->Pointer, dest->Pointer, sizeof(ACPI_OBJECT) * dest->Count)) {
+ AcpiOsFree(dest);
+ return NULL;
+ }
+
+ failed = false;
+
+ for (int i = 0; i < dest->Count; i++) {
+ switch (dest->Pointer[i].Type) {
+ case ACPI_TYPE_INTEGER:
+ break;
+ case ACPI_TYPE_STRING: {
+ void *v = AcpiOsAllocate(dest->Pointer[i].String.Length);
+ if (!v || copyin(dest->Pointer[i].String.Pointer, v, dest->Pointer[i].String.Length))
+ failed = true;
+ dest->Pointer[i].String.Pointer = v;
+ break;
+ }
+ case ACPI_TYPE_BUFFER: {
+ void *v = AcpiOsAllocate(dest->Pointer[i].Buffer.Length);
+ if (!v || copyin(dest->Pointer[i].Buffer.Pointer, v, dest->Pointer[i].Buffer.Length))
+ failed = true;
+ dest->Pointer[i].String.Pointer = v;
+ break;
+ }
+ default:
+ failed = true;
+ break;
+ }
+ }
+
+ if (failed) {
+ free_acpi_object_list(dest);
+ dest = NULL;
+ }
+
+ return dest;
+}
+
static int
acpi_call_ioctl(u_long cmd, caddr_t addr, void *arg)
{
struct acpi_call_descr *params;
+ ACPI_OBJECT_LIST *args;
ACPI_BUFFER result;
+ char path[256];
+ int error;
+ error = 0;
result.Length = ACPI_ALLOCATE_BUFFER;
result.Pointer = NULL;
if (cmd == ACPIIO_CALL) {
params = (struct acpi_call_descr*)addr;
- params->retval = AcpiEvaluateObject(NULL, params->path, ¶ms->args, &result);
+ args = copyin_acpi_object_list(¶ms->args);
+ if (!args)
+ return EINVAL;
+ if (copyinstr(params->path, path, sizeof(path), NULL))
+ return EINVAL;
+ params->retval = AcpiEvaluateObject(NULL, path, args, &result);
if (ACPI_SUCCESS(params->retval))
{
if (result.Pointer != NULL)
@@ -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);
+ error = copyout(result.Pointer, params->result.Pointer,
params->result.Length);
params->reslen = result.Length;
- if (result.Length >= sizeof(ACPI_OBJECT))
- acpi_call_fixup_pointers((ACPI_OBJECT*)(params->result.Pointer), result.Pointer);
}
AcpiOsFree(result.Pointer);
}
}
+ free_acpi_object_list(args);
}
- return (0);
+ return error;
}
void
-acpi_call_fixup_pointers(ACPI_OBJECT *p, UINT8 *orig)
+acpi_call_fixup_pointers(ACPI_OBJECT *p, UINT8 *dest)
{
switch (p->Type)
{
case ACPI_TYPE_STRING:
- p->String.Pointer = (char*)((UINT8*)(p->String.Pointer) - orig + (UINT8*)p);
+ p->String.Pointer += dest - (UINT8*)p;
break;
case ACPI_TYPE_BUFFER:
- p->Buffer.Pointer -= orig - (UINT8*)p;
+ p->Buffer.Pointer += dest - (UINT8*)p;
break;
}
}
|
