* [PATCH 8/8] staging: dgap: fix memory leak in dgap_parsefile()
@ 2014-07-15 3:05 Daeseok Youn
2014-07-15 6:51 ` Dan Carpenter
0 siblings, 1 reply; 5+ messages in thread
From: Daeseok Youn @ 2014-07-15 3:05 UTC (permalink / raw)
To: lidza.louina
Cc: markh, daeseok.youn, gregkh, driverdev-devel, devel, linux-kernel
The p->u.board.status is allocated and set a string as
"No" once within allocating a node of BNODE type.
But it also set again with kstrdup() in case of "STATUS"
or "ID". If it is not allocated yet, use kstrdup().
If not, use just memcpy().
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
drivers/staging/dgap/dgap.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index a207bd7..cedf4b3 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -6598,7 +6598,11 @@ static int dgap_parsefile(char **in)
pr_err("dgap: parse: unexpected end of file\n");
return -1;
}
- p->u.board.status = kstrdup(s, GFP_KERNEL);
+
+ if (p->u.board.status)
+ memcpy(p->u.board.status, s, strlen(s) + 1);
+ else
+ p->u.board.status = kstrdup(s, GFP_KERNEL);
break;
case NPORTS: /* number of ports */
@@ -6648,7 +6652,10 @@ static int dgap_parsefile(char **in)
return -1;
}
- p->u.board.status = kstrdup(s, GFP_KERNEL);
+ if (p->u.board.status)
+ memcpy(p->u.board.status, s, strlen(s) + 1);
+ else
+ p->u.board.status = kstrdup(s, GFP_KERNEL);
if (p->type == CNODE) {
p->u.conc.id = kstrdup(s, GFP_KERNEL);
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 8/8] staging: dgap: fix memory leak in dgap_parsefile()
2014-07-15 3:05 [PATCH 8/8] staging: dgap: fix memory leak in dgap_parsefile() Daeseok Youn
@ 2014-07-15 6:51 ` Dan Carpenter
2014-07-15 9:05 ` DaeSeok Youn
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2014-07-15 6:51 UTC (permalink / raw)
To: Daeseok Youn; +Cc: lidza.louina, devel, gregkh, driverdev-devel, linux-kernel
On Tue, Jul 15, 2014 at 12:05:14PM +0900, Daeseok Youn wrote:
> The p->u.board.status is allocated and set a string as
> "No" once within allocating a node of BNODE type.
> But it also set again with kstrdup() in case of "STATUS"
> or "ID". If it is not allocated yet, use kstrdup().
> If not, use just memcpy().
I don't think a 2 char buffer is always large enough to hold the new
strings.
Just free it and allocate again.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 8/8] staging: dgap: fix memory leak in dgap_parsefile()
2014-07-15 6:51 ` Dan Carpenter
@ 2014-07-15 9:05 ` DaeSeok Youn
2014-07-15 9:21 ` Dan Carpenter
0 siblings, 1 reply; 5+ messages in thread
From: DaeSeok Youn @ 2014-07-15 9:05 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Lidza Louina, devel, Greg KH, driverdev-devel, linux-kernel
2014-07-15 15:51 GMT+09:00 Dan Carpenter <dan.carpenter@oracle.com>:
> On Tue, Jul 15, 2014 at 12:05:14PM +0900, Daeseok Youn wrote:
>> The p->u.board.status is allocated and set a string as
>> "No" once within allocating a node of BNODE type.
>> But it also set again with kstrdup() in case of "STATUS"
>> or "ID". If it is not allocated yet, use kstrdup().
>> If not, use just memcpy().
>
> I don't think a 2 char buffer is always large enough to hold the new
> strings.
>
> Just free it and allocate again.
Yes, I will send this again.
Thanks.
regards,
Daeseok Youn.
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 8/8] staging: dgap: fix memory leak in dgap_parsefile()
2014-07-15 9:05 ` DaeSeok Youn
@ 2014-07-15 9:21 ` Dan Carpenter
2014-07-15 9:45 ` DaeSeok Youn
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2014-07-15 9:21 UTC (permalink / raw)
To: DaeSeok Youn; +Cc: devel, Lidza Louina, driverdev-devel, linux-kernel, Greg KH
On Tue, Jul 15, 2014 at 06:05:35PM +0900, DaeSeok Youn wrote:
> 2014-07-15 15:51 GMT+09:00 Dan Carpenter <dan.carpenter@oracle.com>:
> > On Tue, Jul 15, 2014 at 12:05:14PM +0900, Daeseok Youn wrote:
> >> The p->u.board.status is allocated and set a string as
> >> "No" once within allocating a node of BNODE type.
> >> But it also set again with kstrdup() in case of "STATUS"
> >> or "ID". If it is not allocated yet, use kstrdup().
> >> If not, use just memcpy().
> >
> > I don't think a 2 char buffer is always large enough to hold the new
> > strings.
> >
> > Just free it and allocate again.
> Yes, I will send this again.
>
Actually, please just send the whole set again. I really want Mark on
the CC list so he's reviewing these.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 8/8] staging: dgap: fix memory leak in dgap_parsefile()
2014-07-15 9:21 ` Dan Carpenter
@ 2014-07-15 9:45 ` DaeSeok Youn
0 siblings, 0 replies; 5+ messages in thread
From: DaeSeok Youn @ 2014-07-15 9:45 UTC (permalink / raw)
To: Dan Carpenter; +Cc: devel, Lidza Louina, driverdev-devel, linux-kernel, Greg KH
2014-07-15 18:21 GMT+09:00 Dan Carpenter <dan.carpenter@oracle.com>:
> On Tue, Jul 15, 2014 at 06:05:35PM +0900, DaeSeok Youn wrote:
>> 2014-07-15 15:51 GMT+09:00 Dan Carpenter <dan.carpenter@oracle.com>:
>> > On Tue, Jul 15, 2014 at 12:05:14PM +0900, Daeseok Youn wrote:
>> >> The p->u.board.status is allocated and set a string as
>> >> "No" once within allocating a node of BNODE type.
>> >> But it also set again with kstrdup() in case of "STATUS"
>> >> or "ID". If it is not allocated yet, use kstrdup().
>> >> If not, use just memcpy().
>> >
>> > I don't think a 2 char buffer is always large enough to hold the new
>> > strings.
>> >
>> > Just free it and allocate again.
>> Yes, I will send this again.
>>
>
> Actually, please just send the whole set again. I really want Mark on
> the CC list so he's reviewing these.
OK. I already sent 6/8, 7/8 and 8/8 again. I just resend rest of them.
thanks.
regards,
Daeseok Youn
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-15 9:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-15 3:05 [PATCH 8/8] staging: dgap: fix memory leak in dgap_parsefile() Daeseok Youn
2014-07-15 6:51 ` Dan Carpenter
2014-07-15 9:05 ` DaeSeok Youn
2014-07-15 9:21 ` Dan Carpenter
2014-07-15 9:45 ` DaeSeok Youn
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.