Skip to content

Commit 270f780

Browse files
yhcotepmladek
authored andcommitted
selftests/livepatch: fix mem leaks in test-klp-shadow-vars
In some cases, when an error occurs during testing and the main test routine returns, a memory leak occurs via leaving previously registered shadow variables allocated in the kernel as well as shadow_ptr list elements. From now on, in case of error, remove all allocated shadow variables and shadow_ptr struct elements. Signed-off-by: Yannick Cote <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Reviewed-by: Kamalesh Babulal <[email protected]> Acked-by: Miroslav Benes <[email protected]> Acked-by: Joe Lawrence <[email protected]> Signed-off-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 76efe6d commit 270f780

File tree

1 file changed

+31
-12
lines changed

1 file changed

+31
-12
lines changed

lib/livepatch/test_klp_shadow_vars.c

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ static int test_klp_shadow_vars_init(void)
170170
char *pndup[NUM_OBJS];
171171
int nfields2[NUM_OBJS], *pnfields2[NUM_OBJS], **sv2[NUM_OBJS];
172172
void **sv;
173+
int ret;
173174
int i;
174175

175176
ptr_id(NULL);
@@ -196,31 +197,39 @@ static int test_klp_shadow_vars_init(void)
196197
sizeof(pnfields1[i]), GFP_KERNEL,
197198
shadow_ctor, &pnfields1[i]);
198199
}
199-
if (!sv1[i])
200-
return -ENOMEM;
200+
if (!sv1[i]) {
201+
ret = -ENOMEM;
202+
goto out;
203+
}
201204

202205
pnfields2[i] = &nfields2[i];
203206
ptr_id(pnfields2[i]);
204207
sv2[i] = shadow_alloc(&objs[i], SV_ID2, sizeof(pnfields2[i]),
205208
GFP_KERNEL, shadow_ctor, &pnfields2[i]);
206-
if (!sv2[i])
207-
return -ENOMEM;
209+
if (!sv2[i]) {
210+
ret = -ENOMEM;
211+
goto out;
212+
}
208213
}
209214

210215
/* pass 2: verify we find allocated svars and where they point to */
211216
for (i = 0; i < NUM_OBJS; i++) {
212217
/* check the "char" svar for all objects */
213218
sv = shadow_get(&objs[i], SV_ID1);
214-
if (!sv)
215-
return -EINVAL;
219+
if (!sv) {
220+
ret = -EINVAL;
221+
goto out;
222+
}
216223
if ((char **)sv == sv1[i] && *sv1[i] == pnfields1[i])
217224
pr_info(" got expected PTR%d -> PTR%d result\n",
218225
ptr_id(sv1[i]), ptr_id(*sv1[i]));
219226

220227
/* check the "int" svar for all objects */
221228
sv = shadow_get(&objs[i], SV_ID2);
222-
if (!sv)
223-
return -EINVAL;
229+
if (!sv) {
230+
ret = -EINVAL;
231+
goto out;
232+
}
224233
if ((int **)sv == sv2[i] && *sv2[i] == pnfields2[i])
225234
pr_info(" got expected PTR%d -> PTR%d result\n",
226235
ptr_id(sv2[i]), ptr_id(*sv2[i]));
@@ -233,8 +242,10 @@ static int test_klp_shadow_vars_init(void)
233242

234243
sv = shadow_get_or_alloc(&objs[i], SV_ID1, sizeof(pndup[i]),
235244
GFP_KERNEL, shadow_ctor, &pndup[i]);
236-
if (!sv)
237-
return -EINVAL;
245+
if (!sv) {
246+
ret = -EINVAL;
247+
goto out;
248+
}
238249
if ((char **)sv == sv1[i] && *sv1[i] == pnfields1[i])
239250
pr_info(" got expected PTR%d -> PTR%d result\n",
240251
ptr_id(sv1[i]), ptr_id(*sv1[i]));
@@ -251,8 +262,10 @@ static int test_klp_shadow_vars_init(void)
251262
/* pass 5: check we still find <objs[*], SV_ID2> svar pairs */
252263
for (i = 0; i < NUM_OBJS; i++) {
253264
sv = shadow_get(&objs[i], SV_ID2); /* 'int' pairs */
254-
if (!sv)
255-
return -EINVAL;
265+
if (!sv) {
266+
ret = -EINVAL;
267+
goto out;
268+
}
256269
if ((int **)sv == sv2[i] && *sv2[i] == pnfields2[i])
257270
pr_info(" got expected PTR%d -> PTR%d result\n",
258271
ptr_id(sv2[i]), ptr_id(*sv2[i]));
@@ -269,6 +282,12 @@ static int test_klp_shadow_vars_init(void)
269282
free_ptr_list();
270283

271284
return 0;
285+
out:
286+
shadow_free_all(SV_ID1, NULL); /* 'char' pairs */
287+
shadow_free_all(SV_ID2, NULL); /* 'int' pairs */
288+
free_ptr_list();
289+
290+
return ret;
272291
}
273292

274293
static void test_klp_shadow_vars_exit(void)

0 commit comments

Comments
 (0)