hc
2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84
kernel/lib/ubsan.c
....@@ -143,25 +143,21 @@
143143 }
144144 }
145145
146
-static DEFINE_SPINLOCK(report_lock);
147
-
148
-static void ubsan_prologue(struct source_location *location,
149
- unsigned long *flags)
146
+static void ubsan_prologue(struct source_location *location)
150147 {
151148 current->in_ubsan++;
152
- spin_lock_irqsave(&report_lock, *flags);
153149
154150 pr_err("========================================"
155151 "========================================\n");
156152 print_source_location("UBSAN: Undefined behaviour in", location);
157153 }
158154
159
-static void ubsan_epilogue(unsigned long *flags)
155
+static void ubsan_epilogue(void)
160156 {
161157 dump_stack();
162158 pr_err("========================================"
163159 "========================================\n");
164
- spin_unlock_irqrestore(&report_lock, *flags);
160
+
165161 current->in_ubsan--;
166162 }
167163
....@@ -170,14 +166,13 @@
170166 {
171167
172168 struct type_descriptor *type = data->type;
173
- unsigned long flags;
174169 char lhs_val_str[VALUE_LENGTH];
175170 char rhs_val_str[VALUE_LENGTH];
176171
177172 if (suppress_report(&data->location))
178173 return;
179174
180
- ubsan_prologue(&data->location, &flags);
175
+ ubsan_prologue(&data->location);
181176
182177 val_to_string(lhs_val_str, sizeof(lhs_val_str), type, lhs);
183178 val_to_string(rhs_val_str, sizeof(rhs_val_str), type, rhs);
....@@ -189,7 +184,7 @@
189184 rhs_val_str,
190185 type->type_name);
191186
192
- ubsan_epilogue(&flags);
187
+ ubsan_epilogue();
193188 }
194189
195190 void __ubsan_handle_add_overflow(struct overflow_data *data,
....@@ -217,20 +212,19 @@
217212 void __ubsan_handle_negate_overflow(struct overflow_data *data,
218213 void *old_val)
219214 {
220
- unsigned long flags;
221215 char old_val_str[VALUE_LENGTH];
222216
223217 if (suppress_report(&data->location))
224218 return;
225219
226
- ubsan_prologue(&data->location, &flags);
220
+ ubsan_prologue(&data->location);
227221
228222 val_to_string(old_val_str, sizeof(old_val_str), data->type, old_val);
229223
230224 pr_err("negation of %s cannot be represented in type %s:\n",
231225 old_val_str, data->type->type_name);
232226
233
- ubsan_epilogue(&flags);
227
+ ubsan_epilogue();
234228 }
235229 EXPORT_SYMBOL(__ubsan_handle_negate_overflow);
236230
....@@ -238,13 +232,12 @@
238232 void __ubsan_handle_divrem_overflow(struct overflow_data *data,
239233 void *lhs, void *rhs)
240234 {
241
- unsigned long flags;
242235 char rhs_val_str[VALUE_LENGTH];
243236
244237 if (suppress_report(&data->location))
245238 return;
246239
247
- ubsan_prologue(&data->location, &flags);
240
+ ubsan_prologue(&data->location);
248241
249242 val_to_string(rhs_val_str, sizeof(rhs_val_str), data->type, rhs);
250243
....@@ -254,58 +247,52 @@
254247 else
255248 pr_err("division by zero\n");
256249
257
- ubsan_epilogue(&flags);
250
+ ubsan_epilogue();
258251 }
259252 EXPORT_SYMBOL(__ubsan_handle_divrem_overflow);
260253
261254 static void handle_null_ptr_deref(struct type_mismatch_data_common *data)
262255 {
263
- unsigned long flags;
264
-
265256 if (suppress_report(data->location))
266257 return;
267258
268
- ubsan_prologue(data->location, &flags);
259
+ ubsan_prologue(data->location);
269260
270261 pr_err("%s null pointer of type %s\n",
271262 type_check_kinds[data->type_check_kind],
272263 data->type->type_name);
273264
274
- ubsan_epilogue(&flags);
265
+ ubsan_epilogue();
275266 }
276267
277268 static void handle_misaligned_access(struct type_mismatch_data_common *data,
278269 unsigned long ptr)
279270 {
280
- unsigned long flags;
281
-
282271 if (suppress_report(data->location))
283272 return;
284273
285
- ubsan_prologue(data->location, &flags);
274
+ ubsan_prologue(data->location);
286275
287276 pr_err("%s misaligned address %p for type %s\n",
288277 type_check_kinds[data->type_check_kind],
289278 (void *)ptr, data->type->type_name);
290279 pr_err("which requires %ld byte alignment\n", data->alignment);
291280
292
- ubsan_epilogue(&flags);
281
+ ubsan_epilogue();
293282 }
294283
295284 static void handle_object_size_mismatch(struct type_mismatch_data_common *data,
296285 unsigned long ptr)
297286 {
298
- unsigned long flags;
299
-
300287 if (suppress_report(data->location))
301288 return;
302289
303
- ubsan_prologue(data->location, &flags);
290
+ ubsan_prologue(data->location);
304291 pr_err("%s address %p with insufficient space\n",
305292 type_check_kinds[data->type_check_kind],
306293 (void *) ptr);
307294 pr_err("for an object of type %s\n", data->type->type_name);
308
- ubsan_epilogue(&flags);
295
+ ubsan_epilogue();
309296 }
310297
311298 static void ubsan_type_mismatch_common(struct type_mismatch_data_common *data,
....@@ -352,42 +339,39 @@
352339 void __ubsan_handle_vla_bound_not_positive(struct vla_bound_data *data,
353340 void *bound)
354341 {
355
- unsigned long flags;
356342 char bound_str[VALUE_LENGTH];
357343
358344 if (suppress_report(&data->location))
359345 return;
360346
361
- ubsan_prologue(&data->location, &flags);
347
+ ubsan_prologue(&data->location);
362348
363349 val_to_string(bound_str, sizeof(bound_str), data->type, bound);
364350 pr_err("variable length array bound value %s <= 0\n", bound_str);
365351
366
- ubsan_epilogue(&flags);
352
+ ubsan_epilogue();
367353 }
368354 EXPORT_SYMBOL(__ubsan_handle_vla_bound_not_positive);
369355
370356 void __ubsan_handle_out_of_bounds(struct out_of_bounds_data *data, void *index)
371357 {
372
- unsigned long flags;
373358 char index_str[VALUE_LENGTH];
374359
375360 if (suppress_report(&data->location))
376361 return;
377362
378
- ubsan_prologue(&data->location, &flags);
363
+ ubsan_prologue(&data->location);
379364
380365 val_to_string(index_str, sizeof(index_str), data->index_type, index);
381366 pr_err("index %s is out of range for type %s\n", index_str,
382367 data->array_type->type_name);
383
- ubsan_epilogue(&flags);
368
+ ubsan_epilogue();
384369 }
385370 EXPORT_SYMBOL(__ubsan_handle_out_of_bounds);
386371
387372 void __ubsan_handle_shift_out_of_bounds(struct shift_out_of_bounds_data *data,
388373 void *lhs, void *rhs)
389374 {
390
- unsigned long flags;
391375 struct type_descriptor *rhs_type = data->rhs_type;
392376 struct type_descriptor *lhs_type = data->lhs_type;
393377 char rhs_str[VALUE_LENGTH];
....@@ -396,7 +380,7 @@
396380 if (suppress_report(&data->location))
397381 return;
398382
399
- ubsan_prologue(&data->location, &flags);
383
+ ubsan_prologue(&data->location);
400384
401385 val_to_string(rhs_str, sizeof(rhs_str), rhs_type, rhs);
402386 val_to_string(lhs_str, sizeof(lhs_str), lhs_type, lhs);
....@@ -419,18 +403,16 @@
419403 lhs_str, rhs_str,
420404 lhs_type->type_name);
421405
422
- ubsan_epilogue(&flags);
406
+ ubsan_epilogue();
423407 }
424408 EXPORT_SYMBOL(__ubsan_handle_shift_out_of_bounds);
425409
426410
427411 void __ubsan_handle_builtin_unreachable(struct unreachable_data *data)
428412 {
429
- unsigned long flags;
430
-
431
- ubsan_prologue(&data->location, &flags);
413
+ ubsan_prologue(&data->location);
432414 pr_err("calling __builtin_unreachable()\n");
433
- ubsan_epilogue(&flags);
415
+ ubsan_epilogue();
434416 panic("can't return from __builtin_unreachable()");
435417 }
436418 EXPORT_SYMBOL(__ubsan_handle_builtin_unreachable);
....@@ -438,19 +420,18 @@
438420 void __ubsan_handle_load_invalid_value(struct invalid_value_data *data,
439421 void *val)
440422 {
441
- unsigned long flags;
442423 char val_str[VALUE_LENGTH];
443424
444425 if (suppress_report(&data->location))
445426 return;
446427
447
- ubsan_prologue(&data->location, &flags);
428
+ ubsan_prologue(&data->location);
448429
449430 val_to_string(val_str, sizeof(val_str), data->type, val);
450431
451432 pr_err("load of value %s is not a valid value for type %s\n",
452433 val_str, data->type->type_name);
453434
454
- ubsan_epilogue(&flags);
435
+ ubsan_epilogue();
455436 }
456437 EXPORT_SYMBOL(__ubsan_handle_load_invalid_value);