54 lines
1.2 KiB
Diff
54 lines
1.2 KiB
Diff
|
From fe54b753f57686382754521774fef46a537322fb Mon Sep 17 00:00:00 2001
|
||
|
|
From: liujiawen <liujiawen10@huawei.com>
|
||
|
|
Date: Wed, 24 Jul 2019 03:25:14 +0800
|
||
|
|
Subject: [PATCH] Module: modification summary
|
||
|
|
|
||
|
|
reason:fix memory leaks
|
||
|
|
---
|
||
|
|
mount.cifs.c | 8 +++++++-
|
||
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/mount.cifs.c b/mount.cifs.c
|
||
|
|
index ae7a899..029f01a 100644
|
||
|
|
--- a/mount.cifs.c
|
||
|
|
+++ b/mount.cifs.c
|
||
|
|
@@ -1830,6 +1830,7 @@ assemble_mountinfo(struct parsed_mount_info *parsed_info,
|
||
|
|
}
|
||
|
|
|
||
|
|
assemble_exit:
|
||
|
|
+ free(orgoptions);
|
||
|
|
return rc;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1994,8 +1995,11 @@ int main(int argc, char **argv)
|
||
|
|
|
||
|
|
/* chdir into mountpoint as soon as possible */
|
||
|
|
rc = acquire_mountpoint(&mountpoint);
|
||
|
|
- if (rc)
|
||
|
|
+ if (rc){
|
||
|
|
+ free(mountpoint);
|
||
|
|
+ free(orgoptions);
|
||
|
|
return rc;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/*
|
||
|
|
* mount.cifs does privilege separation. Most of the code to handle
|
||
|
|
@@ -2014,6 +2018,7 @@ int main(int argc, char **argv)
|
||
|
|
/* child */
|
||
|
|
rc = assemble_mountinfo(parsed_info, thisprogram, mountpoint,
|
||
|
|
orig_dev, orgoptions);
|
||
|
|
+ free(mountpoint);
|
||
|
|
return rc;
|
||
|
|
} else {
|
||
|
|
/* parent */
|
||
|
|
@@ -2149,5 +2154,6 @@ mount_exit:
|
||
|
|
}
|
||
|
|
free(options);
|
||
|
|
free(orgoptions);
|
||
|
|
+ free(mountpoint);
|
||
|
|
return rc;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|