Skip to content

Commit 2172e84

Browse files
committed
SUNRPC: Fix occasional warning when destroying gss_krb5_enctypes
I'm guessing that the warning fired because there's some code path that is called on module unload where the gss_krb5_enctypes file was never set up. name 'gss_krb5_enctypes' WARNING: CPU: 0 PID: 6187 at fs/proc/generic.c:712 remove_proc_entry+0x38d/0x460 fs/proc/generic.c:712 destroy_krb5_enctypes_proc_entry net/sunrpc/auth_gss/svcauth_gss.c:1543 [inline] gss_svc_shutdown_net+0x7d/0x2b0 net/sunrpc/auth_gss/svcauth_gss.c:2120 ops_exit_list+0xb0/0x170 net/core/net_namespace.c:169 setup_net+0x9bd/0xe60 net/core/net_namespace.c:356 copy_net_ns+0x320/0x6b0 net/core/net_namespace.c:483 create_new_namespaces+0x3f6/0xb20 kernel/nsproxy.c:110 copy_namespaces+0x410/0x500 kernel/nsproxy.c:179 copy_process+0x311d/0x76b0 kernel/fork.c:2272 kernel_clone+0xeb/0x9a0 kernel/fork.c:2684 __do_sys_clone+0xba/0x100 kernel/fork.c:2825 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd Reported-by: [email protected] Signed-off-by: Chuck Lever <[email protected]>
1 parent dcd779d commit 2172e84

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

net/sunrpc/auth_gss/svcauth_gss.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,18 +1529,19 @@ static int create_krb5_enctypes_proc_entry(struct net *net)
15291529
{
15301530
struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
15311531

1532-
if (!proc_create_data("gss_krb5_enctypes", S_IFREG | 0444,
1533-
sn->proc_net_rpc,
1534-
&gss_krb5_enctypes_proc_ops, net))
1535-
return -ENOMEM;
1536-
return 0;
1532+
sn->gss_krb5_enctypes =
1533+
proc_create_data("gss_krb5_enctypes", S_IFREG | 0444,
1534+
sn->proc_net_rpc, &gss_krb5_enctypes_proc_ops,
1535+
net);
1536+
return sn->gss_krb5_enctypes ? 0 : -ENOMEM;
15371537
}
15381538

15391539
static void destroy_krb5_enctypes_proc_entry(struct net *net)
15401540
{
15411541
struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
15421542

1543-
remove_proc_entry("gss_krb5_enctypes", sn->proc_net_rpc);
1543+
if (sn->gss_krb5_enctypes)
1544+
remove_proc_entry("gss_krb5_enctypes", sn->proc_net_rpc);
15441545
}
15451546

15461547
#else /* CONFIG_PROC_FS */

net/sunrpc/netns.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ struct sunrpc_net {
3333
int pipe_version;
3434
atomic_t pipe_users;
3535
struct proc_dir_entry *use_gssp_proc;
36+
struct proc_dir_entry *gss_krb5_enctypes;
3637
};
3738

3839
extern unsigned int sunrpc_net_id;

0 commit comments

Comments
 (0)