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
|
From 55a09f3c3c3b90e74bcd26cd537396fd2e4ad58e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 4 Jun 2017 16:26:03 +0200
Subject: ntdll: Do not cast unaligned pointer to M128A in set_context_reg.
---
dlls/ntdll/signal_x86_64.c | 48 +++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 61bb2ddce6f..86034c00a50 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -1154,30 +1154,30 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val )
case 14: context->R14 = *(ULONG64 *)val; break;
case 15: context->R15 = *(ULONG64 *)val; break;
case 16: context->Rip = *(ULONG64 *)val; break;
- case 17: context->u.s.Xmm0 = *(M128A *)val; break;
- case 18: context->u.s.Xmm1 = *(M128A *)val; break;
- case 19: context->u.s.Xmm2 = *(M128A *)val; break;
- case 20: context->u.s.Xmm3 = *(M128A *)val; break;
- case 21: context->u.s.Xmm4 = *(M128A *)val; break;
- case 22: context->u.s.Xmm5 = *(M128A *)val; break;
- case 23: context->u.s.Xmm6 = *(M128A *)val; break;
- case 24: context->u.s.Xmm7 = *(M128A *)val; break;
- case 25: context->u.s.Xmm8 = *(M128A *)val; break;
- case 26: context->u.s.Xmm9 = *(M128A *)val; break;
- case 27: context->u.s.Xmm10 = *(M128A *)val; break;
- case 28: context->u.s.Xmm11 = *(M128A *)val; break;
- case 29: context->u.s.Xmm12 = *(M128A *)val; break;
- case 30: context->u.s.Xmm13 = *(M128A *)val; break;
- case 31: context->u.s.Xmm14 = *(M128A *)val; break;
- case 32: context->u.s.Xmm15 = *(M128A *)val; break;
- case 33: context->u.s.Legacy[0] = *(M128A *)val; break;
- case 34: context->u.s.Legacy[1] = *(M128A *)val; break;
- case 35: context->u.s.Legacy[2] = *(M128A *)val; break;
- case 36: context->u.s.Legacy[3] = *(M128A *)val; break;
- case 37: context->u.s.Legacy[4] = *(M128A *)val; break;
- case 38: context->u.s.Legacy[5] = *(M128A *)val; break;
- case 39: context->u.s.Legacy[6] = *(M128A *)val; break;
- case 40: context->u.s.Legacy[7] = *(M128A *)val; break;
+ case 17: memcpy( &context->u.s.Xmm0, val, sizeof(M128A) ); break;
+ case 18: memcpy( &context->u.s.Xmm1, val, sizeof(M128A) ); break;
+ case 19: memcpy( &context->u.s.Xmm2, val, sizeof(M128A) ); break;
+ case 20: memcpy( &context->u.s.Xmm3, val, sizeof(M128A) ); break;
+ case 21: memcpy( &context->u.s.Xmm4, val, sizeof(M128A) ); break;
+ case 22: memcpy( &context->u.s.Xmm5, val, sizeof(M128A) ); break;
+ case 23: memcpy( &context->u.s.Xmm6, val, sizeof(M128A) ); break;
+ case 24: memcpy( &context->u.s.Xmm7, val, sizeof(M128A) ); break;
+ case 25: memcpy( &context->u.s.Xmm8, val, sizeof(M128A) ); break;
+ case 26: memcpy( &context->u.s.Xmm9, val, sizeof(M128A) ); break;
+ case 27: memcpy( &context->u.s.Xmm10, val, sizeof(M128A) ); break;
+ case 28: memcpy( &context->u.s.Xmm11, val, sizeof(M128A) ); break;
+ case 29: memcpy( &context->u.s.Xmm12, val, sizeof(M128A) ); break;
+ case 30: memcpy( &context->u.s.Xmm13, val, sizeof(M128A) ); break;
+ case 31: memcpy( &context->u.s.Xmm14, val, sizeof(M128A) ); break;
+ case 32: memcpy( &context->u.s.Xmm15, val, sizeof(M128A) ); break;
+ case 33: memcpy( &context->u.s.Legacy[0], val, sizeof(M128A) ); break;
+ case 34: memcpy( &context->u.s.Legacy[1], val, sizeof(M128A) ); break;
+ case 35: memcpy( &context->u.s.Legacy[2], val, sizeof(M128A) ); break;
+ case 36: memcpy( &context->u.s.Legacy[3], val, sizeof(M128A) ); break;
+ case 37: memcpy( &context->u.s.Legacy[4], val, sizeof(M128A) ); break;
+ case 38: memcpy( &context->u.s.Legacy[5], val, sizeof(M128A) ); break;
+ case 39: memcpy( &context->u.s.Legacy[6], val, sizeof(M128A) ); break;
+ case 40: memcpy( &context->u.s.Legacy[7], val, sizeof(M128A) ); break;
}
}
--
2.13.0
|