From: Rolf Evers-Fischer <embedded24@evers-fischer.de>
To: kishon@ti.com
Cc: lorenzo.pieralisi@arm.com, bhelgaas@google.com,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>,
Rolf Evers-Fischer <embedded24@evers-fischer.de>
Subject: [PATCH 1/2] pci: endpoint: Free func_name after last usage
Date: Wed, 21 Feb 2018 13:47:06 +0100 [thread overview]
Message-ID: <20180221124707.26308-2-embedded24@evers-fischer.de> (raw)
In-Reply-To: <20180221124707.26308-1-embedded24@evers-fischer.de>
From: Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
This commit decreases the number of jump labels and ensures
that the next commit doesn't increase the number of occurrences
of 'kfree(func_name)'.
Change-Id: I0d1b6fd652395b85f82b11c43bf9b7db512854d1
Signed-off-by: Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
Signed-off-by: Rolf Evers-Fischer <embedded24@evers-fischer.de>
---
drivers/pci/endpoint/pci-epf-core.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index 766ce1dca2ec..23d0e128d1a5 100644
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -220,9 +220,10 @@ struct pci_epf *pci_epf_create(const char *name)
*buf = '\0';
epf->name = kstrdup(func_name, GFP_KERNEL);
+ kfree(func_name);
if (!epf->name) {
ret = -ENOMEM;
- goto free_func_name;
+ goto free_epf;
}
dev = &epf->dev;
@@ -238,16 +239,12 @@ struct pci_epf *pci_epf_create(const char *name)
if (ret)
goto put_dev;
- kfree(func_name);
return epf;
put_dev:
put_device(dev);
kfree(epf->name);
-free_func_name:
- kfree(func_name);
-
free_epf:
kfree(epf);
--
2.16.2
next prev parent reply other threads:[~2018-02-21 12:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-21 12:47 [PATCH 0/2] pci: endpoint: Fix double free in pci_epf_create() Rolf Evers-Fischer
2018-02-21 12:47 ` Rolf Evers-Fischer [this message]
2018-02-21 19:00 ` [PATCH 1/2] pci: endpoint: Free func_name after last usage Andy Shevchenko
2018-02-22 16:21 ` Rolf Evers-Fischer
2018-02-22 17:12 ` Andy Shevchenko
2018-02-22 18:19 ` Lorenzo Pieralisi
2018-02-23 6:10 ` Kishon Vijay Abraham I
2018-02-23 9:36 ` Lorenzo Pieralisi
2018-02-23 10:47 ` Kishon Vijay Abraham I
2018-02-23 17:38 ` Rolf Evers-Fischer
2018-02-23 18:30 ` Lorenzo Pieralisi
2018-02-21 12:47 ` [PATCH 2/2] pci: endpoint: Fix kernel panic after put_device() Rolf Evers-Fischer
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=20180221124707.26308-2-embedded24@evers-fischer.de \
--to=embedded24@evers-fischer.de \
--cc=bhelgaas@google.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rolf.evers.fischer@aptiv.com \
/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 NNTP newsgroup(s).