diff mbox series

sunrpc: Fix RFC6803 encryption test

Message ID 1078410.1681393916@warthog.procyon.org.uk (mailing list archive)
State New, archived
Headers show
Series sunrpc: Fix RFC6803 encryption test | expand

Commit Message

David Howells April 13, 2023, 1:51 p.m. UTC
The usage_data[] array in rfc6803_encrypt_case() is uninitialised, so clear
it as it may cause the tests to fail otherwise.

Fixes: b958cff6b27b ("SUNRPC: Add encryption KUnit tests for the RFC 6803 encryption types")
Link: https://lore.kernel.org/r/380323.1681314997@warthog.procyon.org.uk/
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Chuck Lever <chuck.lever@oracle.com>
cc: Scott Mayhew <smayhew@redhat.com>
cc: Herbert Xu <herbert@gondor.apana.org.au>
cc: linux-nfs@vger.kernel.org
cc: linux-crypto@vger.kernel.org
---
 net/sunrpc/auth_gss/gss_krb5_test.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Chuck Lever April 13, 2023, 1:58 p.m. UTC | #1
> On Apr 13, 2023, at 9:51 AM, David Howells <dhowells@redhat.com> wrote:
> 
> 
> The usage_data[] array in rfc6803_encrypt_case() is uninitialised, so clear
> it as it may cause the tests to fail otherwise.
> 
> Fixes: b958cff6b27b ("SUNRPC: Add encryption KUnit tests for the RFC 6803 encryption types")
> Link: https://lore.kernel.org/r/380323.1681314997@warthog.procyon.org.uk/
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Chuck Lever <chuck.lever@oracle.com>
> cc: Scott Mayhew <smayhew@redhat.com>
> cc: Herbert Xu <herbert@gondor.apana.org.au>
> cc: linux-nfs@vger.kernel.org
> cc: linux-crypto@vger.kernel.org
> ---
> net/sunrpc/auth_gss/gss_krb5_test.c |    1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/net/sunrpc/auth_gss/gss_krb5_test.c b/net/sunrpc/auth_gss/gss_krb5_test.c
> index ce0541e32fc9..aa6ec4e858aa 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_test.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_test.c
> @@ -1327,6 +1327,7 @@ static void rfc6803_encrypt_case(struct kunit *test)
> if (!gk5e)
> kunit_skip(test, "Encryption type is not available");
> 
> + memset(usage_data, 0, sizeof(usage_data));
> usage.data[3] = param->constant;
> 
> Ke.len = gk5e->Ke_length;
> 

Many thanks! I will apply this to nfsd-fixes.


--
Chuck Lever
Scott Mayhew April 13, 2023, 2:37 p.m. UTC | #2
On Thu, 13 Apr 2023, David Howells wrote:

>     
> The usage_data[] array in rfc6803_encrypt_case() is uninitialised, so clear
> it as it may cause the tests to fail otherwise.
> 
> Fixes: b958cff6b27b ("SUNRPC: Add encryption KUnit tests for the RFC 6803 encryption types")
> Link: https://lore.kernel.org/r/380323.1681314997@warthog.procyon.org.uk/
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Chuck Lever <chuck.lever@oracle.com>
> cc: Scott Mayhew <smayhew@redhat.com>
> cc: Herbert Xu <herbert@gondor.apana.org.au>
> cc: linux-nfs@vger.kernel.org
> cc: linux-crypto@vger.kernel.org
> ---
>  net/sunrpc/auth_gss/gss_krb5_test.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/net/sunrpc/auth_gss/gss_krb5_test.c b/net/sunrpc/auth_gss/gss_krb5_test.c
> index ce0541e32fc9..aa6ec4e858aa 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_test.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_test.c
> @@ -1327,6 +1327,7 @@ static void rfc6803_encrypt_case(struct kunit *test)
>  	if (!gk5e)
>  		kunit_skip(test, "Encryption type is not available");
>  
> +	memset(usage_data, 0, sizeof(usage_data));
>  	usage.data[3] = param->constant;
>  
>  	Ke.len = gk5e->Ke_length;
> 

I still see the failures with this patch applied.  The rfc6803 checksum
tests run before the rfc6803 encryption tests, so I'm not sure how this
would help.

-Scott
David Howells April 13, 2023, 3:11 p.m. UTC | #3
Scott Mayhew <smayhew@redhat.com> wrote:

> I still see the failures with this patch applied.  The rfc6803 checksum
> tests run before the rfc6803 encryption tests, so I'm not sure how this
> would help.

It fixes the failure I was getting; it doesn't mean there aren't other bugs.

David
diff mbox series

Patch

diff --git a/net/sunrpc/auth_gss/gss_krb5_test.c b/net/sunrpc/auth_gss/gss_krb5_test.c
index ce0541e32fc9..aa6ec4e858aa 100644
--- a/net/sunrpc/auth_gss/gss_krb5_test.c
+++ b/net/sunrpc/auth_gss/gss_krb5_test.c
@@ -1327,6 +1327,7 @@  static void rfc6803_encrypt_case(struct kunit *test)
 	if (!gk5e)
 		kunit_skip(test, "Encryption type is not available");
 
+	memset(usage_data, 0, sizeof(usage_data));
 	usage.data[3] = param->constant;
 
 	Ke.len = gk5e->Ke_length;