Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d334432 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Kees Cook
Browse files

test_overflow: macrofy some more, do more tests for free 



Obviously a+b==b+a and a*b==b*a, but the implementation of the fallback
checks are not entirely symmetric in how they treat a and b. So we might
as well check the (b,a,r,of) tuple as well as the (a,b,r,of) one for +
and *. Rather than more copy-paste, factor out the common part to
check_one_op.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 455a35a6

lib/test_overflow.c

+22 −26
Original line number Original line Diff line number Diff line
@@ -211,35 +211,31 @@ DEFINE_TEST_ARRAY(s64) = { 
	{0, -S64_MAX, -S64_MAX, S64_MAX, 0, false, false, false},

	{0, -S64_MAX, -S64_MAX, S64_MAX, 0, false, false, false},

};

};





#define check_one_op(t, fmt, op, sym, a, b, r, of) do {		\

	t _r;							\

	bool _of;						\

								\

	_of = check_ ## op ## _overflow(a, b, &_r);		\

	if (_of != of) {					\

		pr_warn("expected "fmt" "sym" "fmt		\

			" to%s overflow (type %s)\n",		\

			a, b, of ? "" : " not", #t);		\

	}							\

	if (_r != r) {						\

		pr_warn("expected "fmt" "sym" "fmt" == "	\

			fmt", got "fmt" (type %s)\n",		\

			a, b, r, _r, #t);			\

	}							\

} while (0)



#define DEFINE_TEST_FUNC(t, fmt)					\

#define DEFINE_TEST_FUNC(t, fmt)					\

static void __init do_test_ ## t(const struct test_ ## t *p)		\

static void __init do_test_ ## t(const struct test_ ## t *p)		\

{							   		\

{							   		\

	t r;								\

	check_one_op(t, fmt, add, "+", p->a, p->b, p->sum, p->s_of);	\

	bool of;							\

	check_one_op(t, fmt, add, "+", p->b, p->a, p->sum, p->s_of);	\

									\

	check_one_op(t, fmt, sub, "-", p->a, p->b, p->diff, p->d_of);	\

	of = check_add_overflow(p->a, p->b, &r);			\

	check_one_op(t, fmt, mul, "*", p->a, p->b, p->prod, p->p_of);	\

	if (of != p->s_of)						\

	check_one_op(t, fmt, mul, "*", p->b, p->a, p->prod, p->p_of);	\

		pr_warn("expected "fmt" + "fmt" to%s overflow (type %s)\n", \

			p->a, p->b, p->s_of ? "" : " not", #t);		\

	if (r != p->sum)						\

		pr_warn("expected "fmt" + "fmt" == "fmt", got "fmt" (type %s)\n", \

			p->a, p->b, p->sum, r, #t);			\

									\

	of = check_sub_overflow(p->a, p->b, &r);			\

	if (of != p->d_of)						\

		pr_warn("expected "fmt" - "fmt" to%s overflow (type %s)\n", \

			p->a, p->b, p->s_of ? "" : " not", #t);		\

	if (r != p->diff)						\

		pr_warn("expected "fmt" - "fmt" == "fmt", got "fmt" (type %s)\n", \

			p->a, p->b, p->diff, r, #t);			\

									\

	of = check_mul_overflow(p->a, p->b, &r);			\

	if (of != p->p_of)						\

		pr_warn("expected "fmt" * "fmt" to%s overflow (type %s)\n", \

			p->a, p->b, p->p_of ? "" : " not", #t);		\

	if (r != p->prod)						\

		pr_warn("expected "fmt" * "fmt" == "fmt", got "fmt" (type %s)\n", \

			p->a, p->b, p->prod, r, #t);			\

}									\

}									\

									\

									\

static void __init test_ ## t ## _overflow(void) {			\

static void __init test_ ## t ## _overflow(void) {			\