diff options
| author | Weston Andros Adamson <dros@netapp.com> | 2013-11-20 12:46:20 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2013-11-20 15:04:47 -0500 |
| commit | d3eac1e59e068cf033f850ab8be016beccf9726d (patch) | |
| tree | 3063079ec2ff87a5a1b9e2faa7a6903b7295e4a9 | |
| parent | f4b43e2ff3db1b12a60c9b5087ac2bcf6ba4bee5 (diff) | |
| download | nfs-utils-d3eac1e59e068cf033f850ab8be016beccf9726d.tar.gz nfs-utils-d3eac1e59e068cf033f850ab8be016beccf9726d.tar.xz nfs-utils-d3eac1e59e068cf033f850ab8be016beccf9726d.zip | |
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".
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/gssd/gssd.h | 1 | ||||
| -rw-r--r-- | utils/gssd/gssd_proc.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/utils/gssd/gssd.h b/utils/gssd/gssd.h index 86472a1..e44ea40 100644 --- a/utils/gssd/gssd.h +++ b/utils/gssd/gssd.h @@ -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; diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index 58c2a28..63fb3ec 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -323,6 +323,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++) { |