From: Julia Lawall <julia@diku.dk>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Cc: kernel-janitors@vger.kernel.org, Andy Grover <agrover@redhat.com>,
Roland Dreier <roland@kernel.org>, Christoph Hellwig <hch@lst.de>,
linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] drivers/target/iscsi/iscsi_target_parameters.c: add missing kfree
Date: Mon, 08 Aug 2011 11:18:01 +0000 [thread overview]
Message-ID: <1312802283-9107-7-git-send-email-julia@diku.dk> (raw)
From: Julia Lawall <julia@diku.dk>
At this point, the new_param that has just been allocated has not been
stored in the list, so it and new_param->name, once it is defined, have to
be freed separately.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@exists@
local idexpression x;
statement S,S1;
expression E;
identifier fl;
expression *ptr != NULL;
@@
x = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x = NULL) S
<... when != x
when != if (...) { <+...kfree(x)...+> }
when any
when != true x = NULL
x->fl
...>
(
if (x = NULL) S1
|
if (...) { ... when != x
when forall
(
return \(0\|<+...x...+>\|ptr\);
|
* return ...;
)
}
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/target/iscsi/iscsi_target_parameters.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index 252e246..b8dbe44 100644
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -584,6 +584,7 @@ int iscsi_copy_param_list(
if (!new_param->name) {
pr_err("Unable to allocate memory for"
" parameter name.\n");
+ kfree(new_param);
goto err_out;
}
@@ -592,6 +593,8 @@ int iscsi_copy_param_list(
if (!new_param->value) {
pr_err("Unable to allocate memory for"
" parameter value.\n");
+ kfree(new_param->name);
+ kfree(new_param);
goto err_out;
}
next reply other threads:[~2011-08-08 11:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-08 11:18 Julia Lawall [this message]
2011-08-08 21:11 ` [PATCH 7/9] drivers/target/iscsi/iscsi_target_parameters.c: Nicholas A. Bellinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312802283-9107-7-git-send-email-julia@diku.dk \
--to=julia@diku.dk \
--cc=agrover@redhat.com \
--cc=hch@lst.de \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=roland@kernel.org \
--cc=target-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox