From 8d82cf1413752c8ab5b9a5eb51611fb2bc1e64d7 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Fri, 22 Sep 2023 17:48:51 +0200 Subject: [PATCH] LU-17015 gss: bump token buffer size to 16KiB A 4 KiB large buffer is not enough to hold the GSS token under some circumstances. So bump GSS_CTX_INIT_MAX_LEN value to 16 KiB. Fixes: 9758129177 ("LU-17015 gss: support large kerberos token on client") Test-Parameters: trivial kerberos=true testlist=sanity-krb5 Signed-off-by: Sebastien Buisson Change-Id: I8e72f1447593d2bf2ae537fcc920ceee20e93c09 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52475 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Aurelien Degremont Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger --- lustre/ptlrpc/gss/gss_internal.h | 2 +- lustre/tests/sanity-krb5.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/ptlrpc/gss/gss_internal.h b/lustre/ptlrpc/gss/gss_internal.h index 8fc39e8..fc37409 100644 --- a/lustre/ptlrpc/gss/gss_internal.h +++ b/lustre/ptlrpc/gss/gss_internal.h @@ -281,7 +281,7 @@ static inline struct gss_sec_keyring *sec2gsec_keyring(struct ptlrpc_sec *sec) # define cache_read_unlock(cdetail) read_unlock(&((cdetail)->hash_lock)) #endif -#define GSS_CTX_INIT_MAX_LEN (4096) +#define GSS_CTX_INIT_MAX_LEN (16384) /* * This only guaranteed be enough for current krb5 des-cbc-crc . We might diff --git a/lustre/tests/sanity-krb5.sh b/lustre/tests/sanity-krb5.sh index 017f18a..c497155 100755 --- a/lustre/tests/sanity-krb5.sh +++ b/lustre/tests/sanity-krb5.sh @@ -426,7 +426,7 @@ test_8() $RUNAS touch $DIR/$tdir/$tfile & TOUCHPID=$! echo "waiting for touch (pid $TOUCHPID) to finish..." - sleep 2 # give it a chance to really trigger context init rpc + sleep 30 # give it a chance to really trigger context init rpc do_facet $SINGLEMDS $LCTL set_param fail_loc=0 wait $TOUCHPID || error "touch should have succeeded" -- 1.8.3.1