From nobody Sat Feb 7 08:53:32 2026 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 060811A9FBD for ; Sat, 24 Jan 2026 05:17:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769231860; cv=none; b=B/tKXbGP6gtCjq7Fz8T4pk3frNwtM8Zot4fLw7DxFFaOMRx/dJAXSfuPttC8R4kVbv6qXU808CGg+CTuPIwKeis4zk0mROH5yTa7DMw1T+pxMGqaYVoMqWCVWd0XFrXF4ci+vKc8apPY3eSxGiZIyv90+v60ktfqlYE7HbzZYtc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769231860; c=relaxed/simple; bh=iAnprdhO3uDJcSm3zWKRSisBMN6wtlRXW/1FQidOFbo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=SDmmiqy3fOmwYk2lttodeRogmin2GGgsYxcpk8yYCIqs6P5ZHHC1Sdr+VzwA+ffwUnGUDUhhcppXJOdL9dpOAW2W2R9blf4lLkJuQk7Rrzt0i0IVscd1CSCAojnq/lU783Py12nMe63qh8ePrJRjLmNinXUFR0SN2AybHjqc694= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UJzw0A0/; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UJzw0A0/" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-34f634dbfd6so2428606a91.2 for ; Fri, 23 Jan 2026 21:17:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769231858; x=1769836658; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=KqASAUm/GFCdALxLtn9qqyibLFPtenKBFroaARUvxic=; b=UJzw0A0/QF3qnOZrM83IGh/GcTuu2slFA7+TJhTEQ5azYWYtayo8+evcZkbHgV6+oJ aa5ou+q/XcTKOYEcswaU4R9IIixAghfk7+5yjzdo+ruiNxeJXIFUHzguZ4nG0vufb00t g5z0shEXl5fObCSo1lbMOtw6Jk+mQX82wkq/gzWeukvDnylEzW0C5uAP89XH0LcNzpCW hmS+SNemPkoD8hRRAPNRlf4ZgFhFcL88vq41YBliD6/7caiRTa8a0loDKDfo7GFBtRty kK0luu1nLvgM1XLfRASV/iwadvw0SCeGFAgViNW/6+pU3XM3++WEsm59CD2nWT4nOYFf m4Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769231858; x=1769836658; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KqASAUm/GFCdALxLtn9qqyibLFPtenKBFroaARUvxic=; b=MqW1B1CfGqNpPt1Nt4U3lK43xkrjKbNNuNYi8mHdflkaqCxxrvDnYaNacB3k/7737l ekjEZYwYRAePgX88Ha0JQdxKyOLVUk9L05JaVVVr/S6bNGJoOxELL7TNugswGqm6mFNF 5gQs0Sd0pCUfabr0UK1ZZ5b6r1cHoeOmyNgtTGaGRjC+A3uDkqDnLYmQ5UR47Pdze0D5 dXkx0KvQIJR4OYabRLWj/hX2WLuxfWPtO3JZxwG+5YuOJ/4kkzA5NIWJOJexXtxwWJcd HB0qlysSSACmZwtphhR/thiOCzGqCl/j9CkDGRRj7XblVLIhjtfA5Szv0QeOgDRlPNp5 +4SQ== X-Forwarded-Encrypted: i=1; AJvYcCUJ5DEt9bsKo0Yv58AUDYjIuU2PUpkWiJlOK0Ogxnl/b8mlXpw6u675dZ3xUHU7g6wUoQc7OZ1K2o7ifLc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywk8oSq8/VepnHoNCenOOpQBKfEFToPAFnjrRGn7K8OOOtNNOxh tkogURnNI/If+gTL+ya20pvmyAF++M5yEBoQWFZB0O3i75+q04uKnrLY3vtci/fS X-Gm-Gg: AZuq6aLjrdlKHOIfuKmur9b2R7KsAUYLFW+1CspFFtMi822Qwk9svUQhaMJL1UtxXhP swhzs2HFmz6Lvlq1qbh31CZLCORaz9ieGdOUrNH/PkfLOn7jmJ8pdU1nt3D6S/t05u92p8hMbvQ X2Lp1fea0Ryz4QSBSRStByfJKcfmq9f8mOjINnmkL2oUuaolrdE+KZj/wxuRHmTzxdKou/6aJjX 8dBS5UQcZ4rQosVE8dw5F5/HtrQkTKH0fsOaXvbS+fWS/BBrsZ78pz6cjahZMa/n06flcrXgpkO 3Hg2NVX9oCrruqW7GqR4mDrhBcz9Tr4KCBL1lAzx8/6wnh7YPeMKpSer2iw2VOYtxFD38jLfB4q dNK5Okzxp19H+PpkJfjscgcRLzn/aTrMT1YB8WWV9GLBoT+AtN1ULLl8ORve3JSrBG9bS5jxD7U ql/4lf418Zu9VhLM+f3tU= X-Received: by 2002:a17:90b:35c9:b0:339:ec9c:b275 with SMTP id 98e67ed59e1d1-3536700c87bmr4676569a91.6.1769231858082; Fri, 23 Jan 2026 21:17:38 -0800 (PST) Received: from [172.16.80.107] ([210.228.119.9]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-353354cdd03sm6464750a91.15.2026.01.23.21.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 21:17:37 -0800 (PST) From: Ryota Sakamoto Date: Sat, 24 Jan 2026 14:17:19 +0900 Subject: [PATCH] SUNRPC: Replace KUnit tests for memcmp() with KUNIT_EXPECT_MEMEQ_MSG() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260124-fix-gcc_krb5-memcmp-v1-1-4648cbbdc78b@gmail.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/x2MWwqAIBAArxL73YJK2eMqEVG21RKaKEQg3T3pc 2BmEkQKTBH6IkGgmyNfLoMsCzDH7HZCXjODEkoLqSrc+MHdmOkMS42WrLEelax12zWkF5KQSx8 oa/91GN/3A6+sajtlAAAA X-Change-ID: 20260124-fix-gcc_krb5-memcmp-2156897e6be1 To: Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: linux-nfs@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ryota Sakamoto X-Mailer: b4 0.14.2 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 --- net/sunrpc/auth_gss/gss_krb5_test.c | 93 ++++++++++++++++++++-------------= ---- 1 file changed, 51 insertions(+), 42 deletions(-) diff --git a/net/sunrpc/auth_gss/gss_krb5_test.c b/net/sunrpc/auth_gss/gss_= krb5_test.c index a5bff02cd7ba48c75a6d270b6584c0f23cb71380..dde1ee934d0d448fe558a633e3d= 729c490ea26ae 100644 --- a/net/sunrpc/auth_gss/gss_krb5_test.c +++ b/net/sunrpc/auth_gss/gss_krb5_test.c @@ -63,10 +63,11 @@ static void kdf_case(struct kunit *test) KUNIT_ASSERT_EQ(test, err, 0); =20 /* Assert */ - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->expected_result->data, - derivedkey.data, derivedkey.len), 0, - "key mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_result->data, + derivedkey.data, + derivedkey.len, + "key mismatch"); } =20 static void checksum_case(struct kunit *test) @@ -111,10 +112,11 @@ static void checksum_case(struct kunit *test) KUNIT_ASSERT_EQ(test, err, 0); =20 /* Assert */ - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->expected_result->data, - checksum.data, checksum.len), 0, - "checksum mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_result->data, + checksum.data, + checksum.len, + "checksum mismatch"); =20 crypto_free_ahash(tfm); } @@ -314,10 +316,11 @@ static void rfc3961_nfold_case(struct kunit *test) param->expected_result->len * 8, result); =20 /* Assert */ - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->expected_result->data, - result, param->expected_result->len), 0, - "result mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_result->data, + result, + param->expected_result->len, + "result mismatch"); } =20 static struct kunit_case rfc3961_test_cases[] =3D { @@ -569,14 +572,16 @@ static void rfc3962_encrypt_case(struct kunit *test) KUNIT_EXPECT_EQ_MSG(test, param->expected_result->len, buf.len, "ciphertext length mismatch"); - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->expected_result->data, - text, param->expected_result->len), 0, - "ciphertext mismatch"); - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->next_iv->data, iv, - param->next_iv->len), 0, - "IV mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_result->data, + text, + param->expected_result->len, + "ciphertext mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->next_iv->data, + iv, + param->next_iv->len, + "IV mismatch"); =20 crypto_free_sync_skcipher(cts_tfm); crypto_free_sync_skcipher(cbc_tfm); @@ -1194,15 +1199,17 @@ static void rfc6803_encrypt_case(struct kunit *test) KUNIT_EXPECT_EQ_MSG(test, param->expected_result->len, buf.len + checksum.len, "ciphertext length mismatch"); - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->expected_result->data, - buf.head[0].iov_base, buf.len), 0, - "encrypted result mismatch"); - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->expected_result->data + - (param->expected_result->len - checksum.len), - checksum.data, checksum.len), 0, - "HMAC mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_result->data, + buf.head[0].iov_base, + buf.len, + "encrypted result mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_result->data + + (param->expected_result->len - checksum.len), + checksum.data, + checksum.len, + "HMAC mismatch"); =20 crypto_free_ahash(ahash_tfm); crypto_free_sync_skcipher(cts_tfm); @@ -1687,15 +1694,16 @@ static void rfc8009_encrypt_case(struct kunit *test) KUNIT_EXPECT_EQ_MSG(test, param->expected_result->len, buf.len, "ciphertext length mismatch"); - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->expected_result->data, - buf.head[0].iov_base, - param->expected_result->len), 0, - "ciphertext mismatch"); - KUNIT_EXPECT_EQ_MSG(test, memcmp(param->expected_hmac->data, - checksum.data, - checksum.len), 0, - "HMAC mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_result->data, + buf.head[0].iov_base, + param->expected_result->len, + "ciphertext mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->expected_hmac->data, + checksum.data, + checksum.len, + "HMAC mismatch"); =20 crypto_free_ahash(ahash_tfm); crypto_free_sync_skcipher(cts_tfm); @@ -1826,10 +1834,11 @@ static void encrypt_selftest_case(struct kunit *tes= t) KUNIT_EXPECT_EQ_MSG(test, param->plaintext->len, buf.len, "length mismatch"); - KUNIT_EXPECT_EQ_MSG(test, - memcmp(param->plaintext->data, - buf.head[0].iov_base, buf.len), 0, - "plaintext mismatch"); + KUNIT_EXPECT_MEMEQ_MSG(test, + param->plaintext->data, + buf.head[0].iov_base, + buf.len, + "plaintext mismatch"); =20 crypto_free_sync_skcipher(cts_tfm); crypto_free_sync_skcipher(cbc_tfm); --- base-commit: 62085877ae6592be830c2267e35dc469cb706308 change-id: 20260124-fix-gcc_krb5-memcmp-2156897e6be1 Best regards, --=20 Ryota Sakamoto