2023-06-27 10:21:26

by Benjamin Coddington

[permalink] [raw]
Subject: [PATCH] NFS: Don't cleanup sysfs superblock entry if uninitialized

Its possible to end up in nfs_free_server() before the server's superblock
sysfs entry has been initialized, in which case calling kobject_put() will
emit a WARNING. Check if the kobject has been initialized before cleaning
it up.

Fixes: 1c7251187dc0 ("NFS: add superblock sysfs entries")
Reported-by: Nathan Chancellor <[email protected]>
Tested-by: Nathan Chancellor <[email protected]>
Signed-off-by: Benjamin Coddington <[email protected]>
---
fs/nfs/client.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 9aea938e4bf2..ed68aee87606 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1010,8 +1010,10 @@ void nfs_free_server(struct nfs_server *server)

nfs_put_client(server->nfs_client);

- nfs_sysfs_remove_server(server);
- kobject_put(&server->kobj);
+ if (server->kobj.state_initialized) {
+ nfs_sysfs_remove_server(server);
+ kobject_put(&server->kobj);
+ }
ida_free(&s_sysfs_ids, server->s_sysfs_id);

ida_destroy(&server->lockowner_id);
--
2.40.1