From: Markus Elfring <Markus.Elfring@web.de>
To: linux-hyperv@vger.kernel.org, kernel-janitors@vger.kernel.org,
Dexuan Cui <decui@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Wei Liu <wei.liu@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, cocci@inria.fr
Subject: [PATCH] Drivers: hv: vmbus: One function call less in create_gpadl_header() after error detection
Date: Tue, 26 Dec 2023 20:09:19 +0100 [thread overview]
Message-ID: <6d97cafb-ad7c-41c1-9f20-41024bb18515@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 26 Dec 2023 20:00:24 +0100
The kfree() function was called in two cases by
the create_gpadl_header() function during error handling
even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.
Thus use another label.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/hv/channel.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 56f7e06c673e..4d1bbda895d8 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -336,7 +336,7 @@ static int create_gpadl_header(enum hv_gpadl_type type, void *kbuffer,
sizeof(struct gpa_range) + pfncount * sizeof(u64);
msgheader = kzalloc(msgsize, GFP_KERNEL);
if (!msgheader)
- goto nomem;
+ goto free_body;
INIT_LIST_HEAD(&msgheader->submsglist);
msgheader->msgsize = msgsize;
@@ -417,7 +417,7 @@ static int create_gpadl_header(enum hv_gpadl_type type, void *kbuffer,
sizeof(struct gpa_range) + pagecount * sizeof(u64);
msgheader = kzalloc(msgsize, GFP_KERNEL);
if (msgheader == NULL)
- goto nomem;
+ goto free_body;
INIT_LIST_HEAD(&msgheader->submsglist);
msgheader->msgsize = msgsize;
@@ -439,6 +439,7 @@ static int create_gpadl_header(enum hv_gpadl_type type, void *kbuffer,
return 0;
nomem:
kfree(msgheader);
+free_body:
kfree(msgbody);
return -ENOMEM;
}
--
2.43.0
next reply other threads:[~2023-12-26 19:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-26 19:09 Markus Elfring [this message]
2024-01-10 5:41 ` [PATCH] Drivers: hv: vmbus: One function call less in create_gpadl_header() after error detection Michael Kelley
2024-01-10 10:58 ` Markus Elfring
2024-01-10 16:15 ` Michael Kelley
2024-01-10 17:08 ` Markus Elfring
2024-01-10 17:53 ` Michael Kelley
2024-01-10 18:37 ` Dan Carpenter
2024-01-10 22:17 ` Michael Kelley
2024-01-11 7:04 ` Dan Carpenter
2024-01-11 14:35 ` Michael Kelley
2024-01-10 11:29 ` [PATCH] " Dan Carpenter
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=6d97cafb-ad7c-41c1-9f20-41024bb18515@web.de \
--to=markus.elfring@web.de \
--cc=cocci@inria.fr \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wei.liu@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).