From: Rolf Evers-Fischer <embedded24@evers-fischer.de>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Rolf Evers-Fischer <embedded24@evers-fischer.de>,
bhelgaas@google.com, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
Subject: Re: [PATCH 1/2] pci: endpoint: Free func_name after last usage
Date: Fri, 23 Feb 2018 18:38:42 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.20.1802231828250.16055@5HSWXM1.fritz.box> (raw)
In-Reply-To: <a7070bd0-72b7-4870-419e-7ac15c6825ae@ti.com>
Hi Kishon,
On Fri, 23 Feb 2018, Kishon Vijay Abraham I wrote:
> On Friday 23 February 2018 03:06 PM, Lorenzo Pieralisi wrote:
> > On Fri, Feb 23, 2018 at 11:40:49AM +0530, Kishon Vijay Abraham I wrote:
> >> Hi Lorenzo,
> >>
> >> On Thursday 22 February 2018 11:49 PM, Lorenzo Pieralisi wrote:
> >>> On Wed, Feb 21, 2018 at 01:47:06PM +0100, Rolf Evers-Fischer wrote:
> >>>> 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);
> >>>
> >>> I am certainly missing something but what if we reworked the code
> >>> and just:
> >>>
> >>> kstrdup(name, GFP_KERNEL);
> >>>
> >>> once instead of allocating another local copy (that we then have to
> >>> free) ?
> >>
> >> name will be something like pci_epf_test.0 and in epf->name we want to just
> >> have pci_epf_test.
> >>>
> >>> Reworded: why
> >>>
> >>> epf->name = func_name;
> >>
> >> memory should be allocated for epf->name before it can be initialized. IMO
> >> without kstrdup, there will be a null pointer exception.
> >
> > I understand that but the point is that func_name *was* allocated with
> > kstrdup() already I would like to understand why we need to do it twice
> > (and kfree the first allocation).
>
> func_name would be allocated for a size greater than what will be in epf->name.
> It won't be significant though.
>
> Thanks
> Kishon
>
I have just an idea, how to use only one copy, but with the shorter
length. What about changing the code like this?
int len = strchrnul(name, '.') - name;
epf->name = kstrndup(name, len, GFP_KERNEL);
In this case we are only allocating the smaller amount of memory and we
don't need the 'buf' and 'func_name' pointers anymore. They will be
replaced with 'len' and some pointer arithmetic.
Kind regards,
Rolf
next prev parent reply other threads:[~2018-02-23 17:38 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 ` [PATCH 1/2] pci: endpoint: Free func_name after last usage Rolf Evers-Fischer
2018-02-21 19:00 ` 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 [this message]
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=alpine.LNX.2.20.1802231828250.16055@5HSWXM1.fritz.box \
--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
all inboxes | Powered by JetHome®