idmapd: plug memory leak in dirscancb
Subsystems (2)
PATCH 1/2 idmapd: plug memory leak in dirscancb
There is a pretty nasty memory leak in idmapd in dirscancb(). Some of our customers have reported that idmapd can eat gigabytes of memory on machines with a large number of mounts and unmounts and a long uptime.
That function uses scandir(), which malloc's an array of strings, but dirscancb() never frees the strings or the array. The following patch should correct this, but I've not yet tested it on 1.0.10 (only on the RHEL4 1.0.6 version). Still, the code is very similar and I'm fairly certain the problem exists in both versions.
utils/idmapd/idmapd.c renamed from utils/idmapd/idmapd.c.leak +8 -3
@@ -464,7 +464,7 @@ dirscancb(int fd, short which, void *dat goto next;if ((ic =calloc (1 ,sizeof (*ic))) ==NULL ) -return ; + goto out;strlcpy (ic->ic_clid, ents[i]->d_name +4 ,sizeof (ic->ic_clid)); path[0 ] ='\0' ;
@@ -474,7 +474,7 @@ dirscancb(int fd, short which, void *datif ((ic->ic_dirfd =open (path,O_RDONLY ,0 )) ==-1 ) {idmapd_warn ("dirscancb: open(%s)" , path);free (ic); -return ; + goto out; }strlcat (path,"/idmap" ,sizeof (path));
@@ -486,7 +486,7 @@ dirscancb(int fd, short which, void *datif (nfsopen (ic) ==-1 ) {close (ic->ic_dirfd);free (ic); -return ; + goto out; } ic->ic_id ="Client" ;
@@ -512,6 +512,11 @@ dirscancb(int fd, short which, void *dat }else ic->ic_scanned =0 ; } + +out: +for (i =0 ; i < nent; i++) +free (ents[i]); +free (ents);return ; }
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs