2019-08-01 11:06:41

by Alice Mitchell

Subject: [PATCH] nfs-utils: Fix memory leak on error in nfs-server-generator

Fix the trivial memory leak in the error handling of nfs-server-generator

Signed-off-by: Alice J Mitchell <[email protected]>
---
systemd/nfs-server-generator.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/systemd/nfs-server-generator.c b/systemd/nfs-server-generator.c
index 737f109..eec98fd 100644
--- a/systemd/nfs-server-generator.c
+++ b/systemd/nfs-server-generator.c
@@ -25,6 +25,7 @@
#include <ctype.h>
#include <stdio.h>
#include <mntent.h>
+#include <alloca.h>

#include "misc.h"
#include "nfslib.h"
@@ -98,7 +99,7 @@ int main(int argc, char *argv[])
exit(1);
}

- path = malloc(strlen(argv[1]) + sizeof(dirbase) + sizeof(filebase));
+ path = alloca(strlen(argv[1]) + sizeof(dirbase) + sizeof(filebase));
if (!path)
exit(2);
if (export_read(_PATH_EXPORTS, 1) +
--
1.8.3.1

2019-08-01 17:58:53

by Steve Dickson

Subject: Re: [PATCH] nfs-utils: Fix memory leak on error in nfs-server-generator

On 8/1/19 6:59 AM, Alice J Mitchell wrote:
> Fix the trivial memory leak in the error handling of nfs-server-generator
>
> Signed-off-by: Alice J Mitchell <[email protected]>
Committed...

steved.
> ---
> systemd/nfs-server-generator.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/systemd/nfs-server-generator.c b/systemd/nfs-server-generator.c
> index 737f109..eec98fd 100644
> --- a/systemd/nfs-server-generator.c
> +++ b/systemd/nfs-server-generator.c
> @@ -25,6 +25,7 @@
> #include <ctype.h>
> #include <stdio.h>
> #include <mntent.h>
> +#include <alloca.h>
>
> #include "misc.h"
> #include "nfslib.h"
> @@ -98,7 +99,7 @@ int main(int argc, char *argv[])
> exit(1);
> }
>
> - path = malloc(strlen(argv[1]) + sizeof(dirbase) + sizeof(filebase));
> + path = alloca(strlen(argv[1]) + sizeof(dirbase) + sizeof(filebase));
> if (!path)
> exit(2);
> if (export_read(_PATH_EXPORTS, 1) +
>