Commit 8b3aacc
vm: fix race condition with timeout param
This fixes a race condition in the watchdog timer used for vm timeouts.
The condition would terminate the main stack's execution instead of the
code running under the sandbox.
Backport-PR-URL: #14373
PR-URL: #13074
Reviewed-By: Anna Henningsen <anna@addaleax.net>1 parent 6e60c83 commit 8b3aacc
File tree
4 files changed
+63
-73
lines changed- src
- test/pummel
4 files changed
+63
-73
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
906 | 906 | | |
907 | 907 | | |
908 | 908 | | |
909 | | - | |
910 | | - | |
| 909 | + | |
| 910 | + | |
911 | 911 | | |
912 | | - | |
913 | | - | |
914 | 912 | | |
915 | | - | |
| 913 | + | |
916 | 914 | | |
917 | | - | |
918 | 915 | | |
919 | | - | |
| 916 | + | |
920 | 917 | | |
921 | | - | |
922 | 918 | | |
923 | 919 | | |
924 | 920 | | |
925 | 921 | | |
926 | | - | |
927 | | - | |
928 | | - | |
929 | | - | |
| 922 | + | |
930 | 923 | | |
931 | 924 | | |
932 | 925 | | |
933 | 926 | | |
934 | 927 | | |
935 | 928 | | |
936 | 929 | | |
937 | | - | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
938 | 936 | | |
939 | 937 | | |
940 | 938 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | 36 | | |
51 | 37 | | |
52 | 38 | | |
| |||
59 | 45 | | |
60 | 46 | | |
61 | 47 | | |
62 | | - | |
63 | | - | |
64 | 48 | | |
65 | 49 | | |
66 | 50 | | |
| |||
72 | 56 | | |
73 | 57 | | |
74 | 58 | | |
75 | | - | |
| 59 | + | |
76 | 60 | | |
77 | 61 | | |
78 | 62 | | |
| |||
85 | 69 | | |
86 | 70 | | |
87 | 71 | | |
88 | | - | |
89 | | - | |
| 72 | + | |
90 | 73 | | |
| 74 | + | |
91 | 75 | | |
92 | 76 | | |
93 | 77 | | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
106 | 81 | | |
107 | 82 | | |
108 | 83 | | |
109 | 84 | | |
110 | 85 | | |
111 | 86 | | |
112 | 87 | | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
| 88 | + | |
120 | 89 | | |
121 | 90 | | |
122 | 91 | | |
123 | 92 | | |
124 | 93 | | |
125 | 94 | | |
126 | | - | |
| 95 | + | |
127 | 96 | | |
128 | 97 | | |
129 | 98 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
20 | 22 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | 23 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | 24 | | |
| 25 | + | |
29 | 26 | | |
30 | 27 | | |
31 | 28 | | |
| |||
35 | 32 | | |
36 | 33 | | |
37 | 34 | | |
38 | | - | |
39 | | - | |
| 35 | + | |
40 | 36 | | |
41 | 37 | | |
42 | 38 | | |
43 | 39 | | |
44 | | - | |
| 40 | + | |
| 41 | + | |
45 | 42 | | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | 43 | | |
50 | | - | |
51 | 44 | | |
52 | 45 | | |
53 | 46 | | |
54 | | - | |
55 | | - | |
56 | 47 | | |
57 | | - | |
58 | | - | |
| 48 | + | |
59 | 49 | | |
60 | 50 | | |
61 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 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 | + | |
0 commit comments