libattr - severe memory leaks from attr_copy_file()
Quoted 4 lines
And the variable, text, is assigned straight away before any use, so I missed where the problem is.
--Tim
The memory leak is really there. Look:
54 attr_parse_attr_conf(struct error_context *ctx)
...
66 repeat:
67 text = malloc(size_guess + 1);
68 if (!text)
69 goto fail;
70
71 if ((file = fopen(ATTR_CONF, "r")) == NULL) {
72 if (errno == ENOENT)
73 return 0;
74 goto fail;
75 }
Let's say that malloc() on the line 67 success, so we have text != NULL. Then, fopen() on the line 71 fails and errno == ENOENT. In that case attr_parse_attr_conf() simply returns 0, but text isn't freed. That's the point, where memory leaks arise. I rewrote the patch, so now is more simpler.
Signature · 1 line
Zdenek Prikryl <[email protected]>
libattr/attr_copy_action.c renamed from libattr/attr_copy_action.c.leak +6 -5
@@ -53,7 +53,7 @@ free_attr_actions(void)static int attr_parse_attr_conf (struct error_context *ctx) { -char *text, *t; +char *text =NULL , *t;size_t size_guess =4096 , len;FILE *file;char *pattern =NULL ;
@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_contexreturn 0 ; repeat: - text =malloc (size_guess +1 ); -if (!text) - goto fail; -if ((file =fopen (ATTR_CONF ,"r" )) ==NULL ) {if (errno ==ENOENT )return 0 ; goto fail; } + + text =malloc (size_guess +1 ); +if (!text) + goto fail; + len =fread (text,1 , size_guess, file);if (ferror (file)) goto fail;
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 20 lines · Zdenek Prikryl
Quoted 4 lines
And the variable, text, is assigned straight away before any use, so I missed where the problem is.
--Tim
The memory leak is really there. Look:
54
attr_parse_attr_conf(struct error_context *ctx)
...
66 repeat:
67 text =malloc(size_guess + 1);
68 if (!text)
69 goto fail;
70
71 if ((file =fopen(ATTR_CONF, "r")) == NULL) {
72 if (errno == ENOENT)
73 return 0;
74 goto fail;
75 }
Quoted 4 lines
Let's say that
malloc()on the line 67 success, so we have text != NULL. Then,fopen()on the line 71 fails and errno == ENOENT. In that caseattr_parse_attr_conf()simply returns 0, but text isn't freed. That's the point, where memory leaks arise. I rewrote the patch, so now is more simpler.
The patch you attached looks good to me, thanks.
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Hi Zdenek,
Quoted 6 lines · Zdenek Prikryl
Quoted 4 lines
And the variable, text, is assigned straight away before any use, so I missed where the problem is.
--Tim
The memory leak is really there. Look:
:-)
Quoted 14 lines
54
attr_parse_attr_conf(struct error_context *ctx)
...
66 repeat:
67 text =malloc(size_guess + 1);
68 if (!text)
69 goto fail;
70
71 if ((file =fopen(ATTR_CONF, "r")) == NULL) {
72 if (errno == ENOENT)
73 return 0;
74 goto fail;
75 }
Quoted 5 lines
Let's say that
malloc()on the line 67 success, so we have text != NULL. Then,fopen()on the line 71 fails and errno == ENOENT. In that caseattr_parse_attr_conf()simply returns 0, but text isn't freed. That's the point, where memory leaks arise. I rewrote the patch, so now is more simpler.
Oh okay.
I see. I was looking at the "fail" case.
Hmmm.... the direct return case.
The simpler patch looks better - cool.
So I now worry about all the cases where we call return directly. It looks like the code is building up an action list and string dup'ing patterns.
So in the normal case where it processes them and then returns 0, I can't see where it is free'ing the text.
Am I missing something again?
My other concern is the free(pattern) and the free(attr_actions->pattern) with the possibility of trying to free the pattern twice. Probably, could set pattern to NULL after it is put into the new action or some such.
--Tim
Quoted 38 lines
--
Zdenek Prikryl <[email protected]>diff -up attr-2.4.43/libattr/attr_copy_action.c.leak
attr-2.4.43/libattr/attr_copy_action.clibattr/attr_copy_action.c 2009-02-17 09:50:38.000000000 +0100 renamed from libattr/attr_copy_action.c.leak 2008-06-30 07:22:50.000000000 +0200 +6
-5@@ -53,7 +53,7 @@ free_attr_actions(void) static int attr_parse_attr_conf(struct error_context *ctx) { - char *text, *t; + char *text = NULL, *t; size_t size_guess = 4096, len; FILE *file; char *pattern = NULL;@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_contex return 0; repeat: - text = malloc(size_guess + 1); - if (!text) - goto fail; - if ((file = fopen(ATTR_CONF, "r")) == NULL) { if (errno == ENOENT) return 0; goto fail; } + + text = malloc(size_guess + 1); + if (!text) + goto fail; + len = fread(text, 1, size_guess, file); if (ferror(file)) goto fail;
Quoted 6 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs