From: aslepykh <145323274+aslepykh@users.noreply.github.com> Date: Fri, 8 Dec 2023 01:54:52 +0000 (+0300) Subject: test: avoid NO_CAST.INTEGER_OVERFLOW in test-oomd-util (#30365) X-Git-Tag: v256-rc1~1555 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f1551fe785e241e7c5534aa0c580b31a83a28b;p=thirdparty%2Fsystemd.git test: avoid NO_CAST.INTEGER_OVERFLOW in test-oomd-util (#30365) The `.mem_total` variable has `uint64_t` type, therefore, when multiplying the number `20971512` by the number `1024` with the suffix `U`, we will not get the expected result of `21,474,828,288`, since the number `20971512` without an explicit type indication has `uint32_t` type. First, multiplication will occur in accordance with the `uint32_t` type; this operation will cause a **type overflow**, and only then will this result be assigned to a `uint64_t` type variable. It's worth adding the `UL` suffix to the number `20971512` to avoid **overflow**. Found by Linux Verification Center (portal.linuxtesting.ru) with SVACE. Author A. Slepykh. --- diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c index d76d91e26d5..1aef6039e12 100644 --- a/src/oom/test-oomd-util.c +++ b/src/oom/test-oomd-util.c @@ -291,19 +291,19 @@ static void test_oomd_pressure_above(void) { static void test_oomd_mem_and_swap_free_below(void) { OomdSystemContext ctx = (OomdSystemContext) { - .mem_total = 20971512 * 1024U, - .mem_used = 3310136 * 1024U, - .swap_total = 20971512 * 1024U, - .swap_used = 20971440 * 1024U, + .mem_total = UINT64_C(20971512) * 1024U, + .mem_used = UINT64_C(3310136) * 1024U, + .swap_total = UINT64_C(20971512) * 1024U, + .swap_used = UINT64_C(20971440) * 1024U, }; assert_se(oomd_mem_available_below(&ctx, 2000) == false); assert_se(oomd_swap_free_below(&ctx, 2000) == true); ctx = (OomdSystemContext) { - .mem_total = 20971512 * 1024U, - .mem_used = 20971440 * 1024U, - .swap_total = 20971512 * 1024U, - .swap_used = 3310136 * 1024U, + .mem_total = UINT64_C(20971512) * 1024U, + .mem_used = UINT64_C(20971440) * 1024U, + .swap_total = UINT64_C(20971512) * 1024U, + .swap_used = UINT64_C(3310136) * 1024U, }; assert_se(oomd_mem_available_below(&ctx, 2000) == true); assert_se(oomd_swap_free_below(&ctx, 2000) == false);