gssd: Fix file descriptor leak of old pipe dirs
Subsystems (2)
PATCH 1/1 gssd: Fix file descriptor leak of old pipe dirs
gssd doesn't properly clean up internal state for old pipes and never closes the (since deleted) clnt_info directory. This leads to eventual fd exhaustion.
To reproduce, run a lot of mount / umounts in a loop and watch the output of 'ls /proc/$PID/fdinfo | wc -l' (where PID is the pid of gssd) steadily grow until gssd eventually crashes with "Too many open files".
This regression was introduced by 841e83c1, which was trying to fix a similar bug in the skip matching logic of update_old_clients. The problem with that patch is that pdir will never match dirname, because dirname is "<pname>/clntXXX".
--- utils/gssd/gssd.h | 1 + utils/gssd/gssd_proc.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
utils/gssd/gssd.h +1 -0
@@ -73,6 +73,7 @@ TAILQ_HEAD(clnt_list_head, clnt_info) clnt_list;struct clnt_info {TAILQ_ENTRY (clnt_info) list;char *dirname; +char *pdir;int dir_fd;char *servicename;char *servername;
utils/gssd/gssd_proc.c +5 -1
@@ -322,6 +322,7 @@ destroy_client(struct clnt_info *clp)if (clp->krb5_fd !=-1 )close (clp->krb5_fd);if (clp->gssd_fd !=-1 )close (clp->gssd_fd);free (clp->dirname); +free (clp->pdir);free (clp->servicename);free (clp->servername);free (clp->protocol);
@@ -463,6 +464,9 @@ process_clnt_dir(char *dir, char *pdir)if (!(clp =insert_new_clnt ())) goto fail_destroy_client; +if (!(clp->pdir =strdup (pdir))) + goto fail_destroy_client; +/* An extra for the '/', and an extra for the null */ if (!(clp->dirname =calloc (strlen (dir) +strlen (pdir) +2 ,1 ))) { goto fail_destroy_client;
@@ -527,7 +531,7 @@ update_old_clients(struct dirent **namelist, int size, char *pdir)/* only compare entries in the global list that are from the * same pipefs parent directory as "pdir" */ -if (strcmp (clp->dirname, pdir) !=0 )continue ; +if (strcmp (clp->pdir, pdir) !=0 )continue ; stillhere =0 ;for (i=0 ; i < size; i++) {
Signature · 1 line
1.8.3.1 (Apple Git-46)
Quoted 8 lines · Weston Andros Adamson
gssd doesn't properly clean up internal state for old pipes and never closes the (since deleted)
clnt_infodirectory. This leads to eventual fd exhaustion.To reproduce, run a lot of mount / umounts in a loop and watch the output of 'ls
/proc/$PID/fdinfo| wc -l' (where PID is the pid of gssd) steadily grow until gssd eventually crashes with "Too many open files".
Quoted 6 lines
This regression was introduced by
841e83c1, which was trying to fix a similar bug in the skip matching logic ofupdate_old_clients. The problem with that patch is that pdir will never match dirname, because dirname is "<pname>/clntXXX".Signed-off-by Weston Andros Adamson <[email protected]>
Committed (tag: nfs-utils-1-2-10-rc1)
steved.
Quoted 49 lines
--- utils/gssd/gssd.h | 1 + utils/gssd/gssd_proc.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)utils/gssd/gssd.h +1
-0@@ -73,6 +73,7 @@ TAILQ_HEAD(clnt_list_head, clnt_info) clnt_list;struct clnt_info {TAILQ_ENTRY (clnt_info) list;char *dirname; +char *pdir;int dir_fd;char *servicename;char *servername;utils/gssd/gssd_proc.c +5
-1@@ -322,6 +322,7 @@ destroy_client(struct clnt_info *clp)if (clp->krb5_fd !=-1 )close (clp->krb5_fd);if (clp->gssd_fd !=-1 )close (clp->gssd_fd);free (clp->dirname); +free (clp->pdir);free (clp->servicename);free (clp->servername);free (clp->protocol);@@ -463,6 +464,9 @@ process_clnt_dir(char *dir, char *pdir)if (!(clp =insert_new_clnt ())) goto fail_destroy_client; +if (!(clp->pdir =strdup (pdir))) + goto fail_destroy_client; +/* An extra for the '/', and an extra for the null */ if (!(clp->dirname =calloc (strlen (dir) +strlen (pdir) +2 ,1 ))) { goto fail_destroy_client;@@ -527,7 +531,7 @@ update_old_clients(struct dirent **namelist, int size, char *pdir)/* only compare entries in the global list that are from the * same pipefs parent directory as "pdir" */ -if (strcmp (clp->dirname, pdir) !=0 )continue ; +if (strcmp (clp->pdir, pdir) !=0 )continue ; stillhere =0 ;for (i=0 ; i < size; i++) {