Skip to content

Commit e57d065

Browse files
committed
NFS & NFSD: Update GSS dependencies
Geert reports that: > On v6.2, "make ARCH=m68k defconfig" gives you > CONFIG_RPCSEC_GSS_KRB5=m > On v6.3, it became builtin, due to dropping the dependencies on > the individual crypto modules. > > $ grep -E "CRYPTO_(MD5|DES|CBC|CTS|ECB|HMAC|SHA1|AES)" .config > CONFIG_CRYPTO_AES=y > CONFIG_CRYPTO_AES_TI=m > CONFIG_CRYPTO_DES=m > CONFIG_CRYPTO_CBC=m > CONFIG_CRYPTO_CTS=m > CONFIG_CRYPTO_ECB=m > CONFIG_CRYPTO_HMAC=m > CONFIG_CRYPTO_MD5=m > CONFIG_CRYPTO_SHA1=m This behavior is triggered by the "default y" in the definition of RPCSEC_GSS. The "default y" was added in 2010 by commit df486a2 ("NFS: Fix the selection of security flavours in Kconfig"). However, svc_gss_principal was removed in 2012 by commit 03a4e1f ("nfsd4: move principal name into svc_cred"), so the 2010 fix is no longer necessary. We can safely change the NFS_V4 and NFSD_V4 dependencies back to RPCSEC_GSS_KRB5 to get the nicer v6.2 behavior back. Selecting KRB5 symbolically represents the true requirement here: that all spec-compliant NFSv4 implementations must have Kerberos available to use. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Fixes: dfe9a12 ("SUNRPC: Enable rpcsec_gss_krb5.ko to be built without CRYPTO_DES") Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 9ca6705 commit e57d065

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/nfs/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ config NFS_V3_ACL
7575
config NFS_V4
7676
tristate "NFS client support for NFS version 4"
7777
depends on NFS_FS
78-
select SUNRPC_GSS
78+
select RPCSEC_GSS_KRB5
7979
select KEYS
8080
help
8181
This option enables support for version 4 of the NFS protocol

fs/nfsd/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ config NFSD_V4
7373
bool "NFS server support for NFS version 4"
7474
depends on NFSD && PROC_FS
7575
select FS_POSIX_ACL
76-
select SUNRPC_GSS
76+
select RPCSEC_GSS_KRB5
7777
select CRYPTO
7878
select CRYPTO_MD5
7979
select CRYPTO_SHA256

0 commit comments

Comments
 (0)