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
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
From 5564323f643715f9d364df88e0eb9c7d6fd2c22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
Date: Tue, 5 Mar 2024 11:59:43 +0100
Subject: [PATCH 32/67] xen/livepatch: fix norevert test attempt to open-code
revert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The purpose of the norevert test is to install a dummy handler that replaces
the internal Xen revert code, and then perform the revert in the post-revert
hook. For that purpose the usage of the previous common_livepatch_revert() is
not enough, as that just reverts specific functions, but not the whole state of
the payload.
Remove both common_livepatch_{apply,revert}() and instead expose
revert_payload{,_tail}() in order to perform the patch revert from the
post-revert hook.
Fixes: 6047104c3ccc ('livepatch: Add per-function applied/reverted state tracking marker')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Ross Lagerwall <ross.lagerwall@citrix.com>
master commit: cdae267ce10d04d71d1687b5701ff2911a96b6dc
master date: 2024-02-28 16:57:25 +0000
---
xen/common/livepatch.c | 41 +++++++++++++++++--
xen/include/xen/livepatch.h | 32 ++-------------
.../livepatch/xen_action_hooks_norevert.c | 22 +++-------
3 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c
index a129ab9973..a5068a2217 100644
--- a/xen/common/livepatch.c
+++ b/xen/common/livepatch.c
@@ -1310,7 +1310,22 @@ static int apply_payload(struct payload *data)
ASSERT(!local_irq_is_enabled());
for ( i = 0; i < data->nfuncs; i++ )
- common_livepatch_apply(&data->funcs[i], &data->fstate[i]);
+ {
+ const struct livepatch_func *func = &data->funcs[i];
+ struct livepatch_fstate *state = &data->fstate[i];
+
+ /* If the action has been already executed on this function, do nothing. */
+ if ( state->applied == LIVEPATCH_FUNC_APPLIED )
+ {
+ printk(XENLOG_WARNING LIVEPATCH
+ "%s: %s has been already applied before\n",
+ __func__, func->name);
+ continue;
+ }
+
+ arch_livepatch_apply(func, state);
+ state->applied = LIVEPATCH_FUNC_APPLIED;
+ }
arch_livepatch_revive();
@@ -1326,7 +1341,7 @@ static inline void apply_payload_tail(struct payload *data)
data->state = LIVEPATCH_STATE_APPLIED;
}
-static int revert_payload(struct payload *data)
+int revert_payload(struct payload *data)
{
unsigned int i;
int rc;
@@ -1341,7 +1356,25 @@ static int revert_payload(struct payload *data)
}
for ( i = 0; i < data->nfuncs; i++ )
- common_livepatch_revert(&data->funcs[i], &data->fstate[i]);
+ {
+ const struct livepatch_func *func = &data->funcs[i];
+ struct livepatch_fstate *state = &data->fstate[i];
+
+ /*
+ * If the apply action hasn't been executed on this function, do
+ * nothing.
+ */
+ if ( !func->old_addr || state->applied == LIVEPATCH_FUNC_NOT_APPLIED )
+ {
+ printk(XENLOG_WARNING LIVEPATCH
+ "%s: %s has not been applied before\n",
+ __func__, func->name);
+ continue;
+ }
+
+ arch_livepatch_revert(func, state);
+ state->applied = LIVEPATCH_FUNC_NOT_APPLIED;
+ }
/*
* Since we are running with IRQs disabled and the hooks may call common
@@ -1359,7 +1392,7 @@ static int revert_payload(struct payload *data)
return 0;
}
-static inline void revert_payload_tail(struct payload *data)
+void revert_payload_tail(struct payload *data)
{
list_del(&data->applied_list);
diff --git a/xen/include/xen/livepatch.h b/xen/include/xen/livepatch.h
index 537d3d58b6..c9ee58fd37 100644
--- a/xen/include/xen/livepatch.h
+++ b/xen/include/xen/livepatch.h
@@ -136,35 +136,11 @@ void arch_livepatch_post_action(void);
void arch_livepatch_mask(void);
void arch_livepatch_unmask(void);
-static inline void common_livepatch_apply(const struct livepatch_func *func,
- struct livepatch_fstate *state)
-{
- /* If the action has been already executed on this function, do nothing. */
- if ( state->applied == LIVEPATCH_FUNC_APPLIED )
- {
- printk(XENLOG_WARNING LIVEPATCH "%s: %s has been already applied before\n",
- __func__, func->name);
- return;
- }
-
- arch_livepatch_apply(func, state);
- state->applied = LIVEPATCH_FUNC_APPLIED;
-}
+/* Only for testing purposes. */
+struct payload;
+int revert_payload(struct payload *data);
+void revert_payload_tail(struct payload *data);
-static inline void common_livepatch_revert(const struct livepatch_func *func,
- struct livepatch_fstate *state)
-{
- /* If the apply action hasn't been executed on this function, do nothing. */
- if ( !func->old_addr || state->applied == LIVEPATCH_FUNC_NOT_APPLIED )
- {
- printk(XENLOG_WARNING LIVEPATCH "%s: %s has not been applied before\n",
- __func__, func->name);
- return;
- }
-
- arch_livepatch_revert(func, state);
- state->applied = LIVEPATCH_FUNC_NOT_APPLIED;
-}
#else
/*
diff --git a/xen/test/livepatch/xen_action_hooks_norevert.c b/xen/test/livepatch/xen_action_hooks_norevert.c
index c173855192..c5fbab1746 100644
--- a/xen/test/livepatch/xen_action_hooks_norevert.c
+++ b/xen/test/livepatch/xen_action_hooks_norevert.c
@@ -96,26 +96,14 @@ static int revert_hook(livepatch_payload_t *payload)
static void post_revert_hook(livepatch_payload_t *payload)
{
- int i;
+ unsigned long flags;
printk(KERN_DEBUG "%s: Hook starting.\n", __func__);
- for (i = 0; i < payload->nfuncs; i++)
- {
- const struct livepatch_func *func = &payload->funcs[i];
- struct livepatch_fstate *fstate = &payload->fstate[i];
-
- BUG_ON(revert_cnt != 1);
- BUG_ON(fstate->applied != LIVEPATCH_FUNC_APPLIED);
-
- /* Outside of quiesce zone: MAY TRIGGER HOST CRASH/UNDEFINED BEHAVIOR */
- arch_livepatch_quiesce();
- common_livepatch_revert(payload);
- arch_livepatch_revive();
- BUG_ON(fstate->applied == LIVEPATCH_FUNC_APPLIED);
-
- printk(KERN_DEBUG "%s: post reverted: %s\n", __func__, func->name);
- }
+ local_irq_save(flags);
+ BUG_ON(revert_payload(payload));
+ revert_payload_tail(payload);
+ local_irq_restore(flags);
printk(KERN_DEBUG "%s: Hook done.\n", __func__);
}
--
2.44.0
|
GitWeb