* [RESEND PATCH 0/2] scripts: small fixes
@ 2016-04-12 15:18 Maxim Zhukov
2016-04-12 15:18 ` [PATCH 1/2] scripts: genksyms: fix resource leak Maxim Zhukov
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Maxim Zhukov @ 2016-04-12 15:18 UTC (permalink / raw)
To: Rob Herring; +Cc: Frank Rowand, Grant Likely, linux-kernel
[PATCH 1/2] scripts: genksyms: fix resource leak
[PATCH 2/2] scripts: dtc: fix memory leak after realloc
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] scripts: genksyms: fix resource leak
2016-04-12 15:18 [RESEND PATCH 0/2] scripts: small fixes Maxim Zhukov
@ 2016-04-12 15:18 ` Maxim Zhukov
2016-04-12 15:18 ` [PATCH 2/2] scripts: dtc: fix memory leak after realloc Maxim Zhukov
2016-04-12 15:39 ` [RESEND PATCH 0/2] scripts: small fixes Rob Herring
2 siblings, 0 replies; 5+ messages in thread
From: Maxim Zhukov @ 2016-04-12 15:18 UTC (permalink / raw)
To: Rob Herring; +Cc: Frank Rowand, Grant Likely, linux-kernel, Maxim Zhukov
This commit fixed resource leak at func main
Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
---
scripts/genksyms/genksyms.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index dafaf96..06121ce 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -873,5 +873,8 @@ int main(int argc, char **argv)
(double)nsyms / (double)HASH_BUCKETS);
}
+ if (dumpfile)
+ fclose(dumpfile);
+
return errors != 0;
}
--
2.7.1.1.g3617aa0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] scripts: dtc: fix memory leak after realloc
2016-04-12 15:18 [RESEND PATCH 0/2] scripts: small fixes Maxim Zhukov
2016-04-12 15:18 ` [PATCH 1/2] scripts: genksyms: fix resource leak Maxim Zhukov
@ 2016-04-12 15:18 ` Maxim Zhukov
2016-04-12 15:39 ` [RESEND PATCH 0/2] scripts: small fixes Rob Herring
2 siblings, 0 replies; 5+ messages in thread
From: Maxim Zhukov @ 2016-04-12 15:18 UTC (permalink / raw)
To: Rob Herring; +Cc: Frank Rowand, Grant Likely, linux-kernel, Maxim Zhukov
This commit fixed memory leak after errors realloc.
Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
---
scripts/dtc/fdtput.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/dtc/fdtput.c b/scripts/dtc/fdtput.c
index f2197f5..1042319 100644
--- a/scripts/dtc/fdtput.c
+++ b/scripts/dtc/fdtput.c
@@ -75,8 +75,9 @@ static int encode_value(struct display_info *disp, char **arg, int arg_count,
char *ptr; /* pointer to current value position */
int len; /* length of this cell/string/byte */
int ival;
- int upto; /* the number of bytes we have written to buf */
+ int upto; /* the number of bytes we have written to buf */
char fmt[3];
+ void *save_ptr = NULL; /* save pointer to realloc */
upto = 0;
@@ -96,12 +97,15 @@ static int encode_value(struct display_info *disp, char **arg, int arg_count,
/* enlarge our value buffer by a suitable margin if needed */
if (upto + len > value_size) {
value_size = (upto + len) + 500;
- value = realloc(value, value_size);
- if (!value) {
+ void *save_ptr = realloc(value, value_size);
+
+ if (!save_ptr) {
+ free(value);
fprintf(stderr, "Out of mmory: cannot alloc "
"%d bytes\n", value_size);
return -1;
}
+ value = save_ptr;
}
ptr = value + upto;
--
2.7.1.1.g3617aa0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH 0/2] scripts: small fixes
2016-04-12 15:18 [RESEND PATCH 0/2] scripts: small fixes Maxim Zhukov
2016-04-12 15:18 ` [PATCH 1/2] scripts: genksyms: fix resource leak Maxim Zhukov
2016-04-12 15:18 ` [PATCH 2/2] scripts: dtc: fix memory leak after realloc Maxim Zhukov
@ 2016-04-12 15:39 ` Rob Herring
2016-04-12 15:40 ` Rob Herring
2 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2016-04-12 15:39 UTC (permalink / raw)
To: Maxim Zhukov; +Cc: Frank Rowand, Grant Likely, linux-kernel
On Tue, Apr 12, 2016 at 10:18 AM, Maxim Zhukov
<mussitantesmortem@gmail.com> wrote:
> [PATCH 1/2] scripts: genksyms: fix resource leak
> [PATCH 2/2] scripts: dtc: fix memory leak after realloc
scripts/dtc is just an import of upstream dtc[1]. So your patches need
to be against that and sent to devicetree-compiler@vger.kernel.org.
Once they are in, I can do a new import.
Rob
[1] git://git.kernel.org/pub/scm/utils/dtc/dtc.git
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH 0/2] scripts: small fixes
2016-04-12 15:39 ` [RESEND PATCH 0/2] scripts: small fixes Rob Herring
@ 2016-04-12 15:40 ` Rob Herring
0 siblings, 0 replies; 5+ messages in thread
From: Rob Herring @ 2016-04-12 15:40 UTC (permalink / raw)
To: Maxim Zhukov; +Cc: Frank Rowand, Grant Likely, linux-kernel
On Tue, Apr 12, 2016 at 10:39 AM, Rob Herring <robh+dt@kernel.org> wrote:
> On Tue, Apr 12, 2016 at 10:18 AM, Maxim Zhukov
> <mussitantesmortem@gmail.com> wrote:
>> [PATCH 1/2] scripts: genksyms: fix resource leak
>> [PATCH 2/2] scripts: dtc: fix memory leak after realloc
>
> scripts/dtc is just an import of upstream dtc[1]. So your patches need
> to be against that and sent to devicetree-compiler@vger.kernel.org.
> Once they are in, I can do a new import.
Sorry, that's only for patch 2.
Rob
>
> Rob
>
> [1] git://git.kernel.org/pub/scm/utils/dtc/dtc.git
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-04-12 15:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-12 15:18 [RESEND PATCH 0/2] scripts: small fixes Maxim Zhukov
2016-04-12 15:18 ` [PATCH 1/2] scripts: genksyms: fix resource leak Maxim Zhukov
2016-04-12 15:18 ` [PATCH 2/2] scripts: dtc: fix memory leak after realloc Maxim Zhukov
2016-04-12 15:39 ` [RESEND PATCH 0/2] scripts: small fixes Rob Herring
2016-04-12 15:40 ` Rob Herring
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.