|
 |
4d476f |
autofs-5.1.0 - fix leak in parse_mount()
|
|
|
4d476f |
|
|
|
4d476f |
From: Ian Kent <ikent@redhat.com>
|
|
|
4d476f |
|
|
|
4d476f |
Fix a potential memory leak of the allocated mount location
|
|
|
4d476f |
in modules/parse_sun.c:parse_mount().
|
|
|
4d476f |
---
|
|
|
4d476f |
CHANGELOG | 1 +
|
|
|
4d476f |
modules/parse_sun.c | 8 ++++++--
|
|
|
4d476f |
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
4d476f |
|
|
|
4d476f |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
4d476f |
+++ autofs-5.0.7/CHANGELOG
|
|
|
4d476f |
@@ -144,6 +144,7 @@
|
|
|
4d476f |
- check options length before use in parse_amd.c.
|
|
|
4d476f |
- fix some out of order evaluations in parse_amd.c.
|
|
|
4d476f |
- fix copy and paste error in dup_defaults_entry().
|
|
|
4d476f |
+- fix leak in parse_mount().
|
|
|
4d476f |
|
|
|
4d476f |
25/07/2012 autofs-5.0.7
|
|
|
4d476f |
=======================
|
|
|
4d476f |
--- autofs-5.0.7.orig/modules/parse_sun.c
|
|
|
4d476f |
+++ autofs-5.0.7/modules/parse_sun.c
|
|
|
4d476f |
@@ -1567,7 +1567,10 @@ int parse_mount(struct autofs_point *ap,
|
|
|
4d476f |
*/
|
|
|
4d476f |
if ((strstr(options, "fstype=autofs") &&
|
|
|
4d476f |
strstr(options, "hosts"))) {
|
|
|
4d476f |
- loc = NULL;
|
|
|
4d476f |
+ if (loc) {
|
|
|
4d476f |
+ free(loc);
|
|
|
4d476f |
+ loc = NULL;
|
|
|
4d476f |
+ }
|
|
|
4d476f |
loclen = 0;
|
|
|
4d476f |
} else {
|
|
|
4d476f |
loclen = strlen(loc);
|
|
|
4d476f |
@@ -1591,7 +1594,8 @@ int parse_mount(struct autofs_point *ap,
|
|
|
4d476f |
rv = sun_mount(ap, ap->path, name, name_len,
|
|
|
4d476f |
loc, loclen, options, ctxt);
|
|
|
4d476f |
|
|
|
4d476f |
- free(loc);
|
|
|
4d476f |
+ if (loc)
|
|
|
4d476f |
+ free(loc);
|
|
|
4d476f |
free(options);
|
|
|
4d476f |
pthread_setcancelstate(cur_state, NULL);
|
|
|
4d476f |
}
|