tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

SUNRPC: Replace KUnit tests for memcmp() with KUNIT_EXPECT_MEMEQ_MSG()

Replace KUnit tests for memcmp() with KUNIT_EXPECT_MEMEQ_MSG() to improve
debugging that prints the hex dump of the buffers when the assertion fails,
whereas memcmp() only returns an integer difference.

Signed-off-by: Ryota Sakamoto <sakamo.ryota@gmail.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

authored by

Ryota Sakamoto and committed by
Chuck Lever ed7f4d32 a0ed7975

+51 -42
+51 -42
net/sunrpc/auth_gss/gss_krb5_test.c
··· 63 63 KUNIT_ASSERT_EQ(test, err, 0); 64 64 65 65 /* Assert */ 66 - KUNIT_EXPECT_EQ_MSG(test, 67 - memcmp(param->expected_result->data, 68 - derivedkey.data, derivedkey.len), 0, 69 - "key mismatch"); 66 + KUNIT_EXPECT_MEMEQ_MSG(test, 67 + param->expected_result->data, 68 + derivedkey.data, 69 + derivedkey.len, 70 + "key mismatch"); 70 71 } 71 72 72 73 static void checksum_case(struct kunit *test) ··· 112 111 KUNIT_ASSERT_EQ(test, err, 0); 113 112 114 113 /* Assert */ 115 - KUNIT_EXPECT_EQ_MSG(test, 116 - memcmp(param->expected_result->data, 117 - checksum.data, checksum.len), 0, 118 - "checksum mismatch"); 114 + KUNIT_EXPECT_MEMEQ_MSG(test, 115 + param->expected_result->data, 116 + checksum.data, 117 + checksum.len, 118 + "checksum mismatch"); 119 119 120 120 crypto_free_ahash(tfm); 121 121 } ··· 316 314 param->expected_result->len * 8, result); 317 315 318 316 /* Assert */ 319 - KUNIT_EXPECT_EQ_MSG(test, 320 - memcmp(param->expected_result->data, 321 - result, param->expected_result->len), 0, 322 - "result mismatch"); 317 + KUNIT_EXPECT_MEMEQ_MSG(test, 318 + param->expected_result->data, 319 + result, 320 + param->expected_result->len, 321 + "result mismatch"); 323 322 } 324 323 325 324 static struct kunit_case rfc3961_test_cases[] = { ··· 572 569 KUNIT_EXPECT_EQ_MSG(test, 573 570 param->expected_result->len, buf.len, 574 571 "ciphertext length mismatch"); 575 - KUNIT_EXPECT_EQ_MSG(test, 576 - memcmp(param->expected_result->data, 577 - text, param->expected_result->len), 0, 578 - "ciphertext mismatch"); 579 - KUNIT_EXPECT_EQ_MSG(test, 580 - memcmp(param->next_iv->data, iv, 581 - param->next_iv->len), 0, 582 - "IV mismatch"); 572 + KUNIT_EXPECT_MEMEQ_MSG(test, 573 + param->expected_result->data, 574 + text, 575 + param->expected_result->len, 576 + "ciphertext mismatch"); 577 + KUNIT_EXPECT_MEMEQ_MSG(test, 578 + param->next_iv->data, 579 + iv, 580 + param->next_iv->len, 581 + "IV mismatch"); 583 582 584 583 crypto_free_sync_skcipher(cts_tfm); 585 584 crypto_free_sync_skcipher(cbc_tfm); ··· 1199 1194 KUNIT_EXPECT_EQ_MSG(test, param->expected_result->len, 1200 1195 buf.len + checksum.len, 1201 1196 "ciphertext length mismatch"); 1202 - KUNIT_EXPECT_EQ_MSG(test, 1203 - memcmp(param->expected_result->data, 1204 - buf.head[0].iov_base, buf.len), 0, 1205 - "encrypted result mismatch"); 1206 - KUNIT_EXPECT_EQ_MSG(test, 1207 - memcmp(param->expected_result->data + 1208 - (param->expected_result->len - checksum.len), 1209 - checksum.data, checksum.len), 0, 1210 - "HMAC mismatch"); 1197 + KUNIT_EXPECT_MEMEQ_MSG(test, 1198 + param->expected_result->data, 1199 + buf.head[0].iov_base, 1200 + buf.len, 1201 + "encrypted result mismatch"); 1202 + KUNIT_EXPECT_MEMEQ_MSG(test, 1203 + param->expected_result->data + 1204 + (param->expected_result->len - checksum.len), 1205 + checksum.data, 1206 + checksum.len, 1207 + "HMAC mismatch"); 1211 1208 1212 1209 crypto_free_ahash(ahash_tfm); 1213 1210 crypto_free_sync_skcipher(cts_tfm); ··· 1694 1687 KUNIT_EXPECT_EQ_MSG(test, 1695 1688 param->expected_result->len, buf.len, 1696 1689 "ciphertext length mismatch"); 1697 - KUNIT_EXPECT_EQ_MSG(test, 1698 - memcmp(param->expected_result->data, 1699 - buf.head[0].iov_base, 1700 - param->expected_result->len), 0, 1701 - "ciphertext mismatch"); 1702 - KUNIT_EXPECT_EQ_MSG(test, memcmp(param->expected_hmac->data, 1703 - checksum.data, 1704 - checksum.len), 0, 1705 - "HMAC mismatch"); 1690 + KUNIT_EXPECT_MEMEQ_MSG(test, 1691 + param->expected_result->data, 1692 + buf.head[0].iov_base, 1693 + param->expected_result->len, 1694 + "ciphertext mismatch"); 1695 + KUNIT_EXPECT_MEMEQ_MSG(test, 1696 + param->expected_hmac->data, 1697 + checksum.data, 1698 + checksum.len, 1699 + "HMAC mismatch"); 1706 1700 1707 1701 crypto_free_ahash(ahash_tfm); 1708 1702 crypto_free_sync_skcipher(cts_tfm); ··· 1834 1826 KUNIT_EXPECT_EQ_MSG(test, 1835 1827 param->plaintext->len, buf.len, 1836 1828 "length mismatch"); 1837 - KUNIT_EXPECT_EQ_MSG(test, 1838 - memcmp(param->plaintext->data, 1839 - buf.head[0].iov_base, buf.len), 0, 1840 - "plaintext mismatch"); 1829 + KUNIT_EXPECT_MEMEQ_MSG(test, 1830 + param->plaintext->data, 1831 + buf.head[0].iov_base, 1832 + buf.len, 1833 + "plaintext mismatch"); 1841 1834 1842 1835 crypto_free_sync_skcipher(cts_tfm); 1843 1836 crypto_free_sync_skcipher(cbc_tfm);