From: Cornelia Huck <cohuck@redhat.com>
To: Farhan Ali <alifm@linux.ibm.com>
Cc: farman@linux.ibm.com, pasic@linux.ibm.com,
linux-s390@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [RFC v2 2/5] vfio-ccw: Fix memory leak and don't call cp_free in cp_init
Date: Tue, 9 Jul 2019 16:18:56 +0200 [thread overview]
Message-ID: <20190709161856.269aca0d.cohuck@redhat.com> (raw)
In-Reply-To: <1a6f6e71-037f-455a-062d-0e8fdd2476c5@linux.ibm.com>
On Tue, 9 Jul 2019 10:07:57 -0400
Farhan Ali <alifm@linux.ibm.com> wrote:
> On 07/09/2019 06:06 AM, Cornelia Huck wrote:
> > On Mon, 8 Jul 2019 16:10:35 -0400
> > Farhan Ali <alifm@linux.ibm.com> wrote:
> >
> >> We don't set cp->initialized to true so calling cp_free
> >> will just return and not do anything.
> >>
> >> Also fix a memory leak where we fail to free a ccwchain
> >> on an error.
> >>
> >> Fixes: 812271b910 ("s390/cio: Squash cp_free() and cp_unpin_free()")
> >> Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
> >> ---
> >> drivers/s390/cio/vfio_ccw_cp.c | 11 +++++++----
> >> 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > (...)
> >
> >> @@ -642,8 +647,6 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
> >>
> >> /* Build a ccwchain for the first CCW segment */
> >> ret = ccwchain_handle_ccw(orb->cmd.cpa, cp);
> >> - if (ret)
> >> - cp_free(cp);
> >
> > Now that I look again: it's a bit odd that we set the bit in all cases,
> > even if we have an error. We could move that into the !ret branch that
> > sets ->initialized; but it does not really hurt.
>
> By setting the bit, I am assuming you meant cmd.c64?
>
> Yes, it doesn't harm anything but for better code readability you have a
> good point. I will move it into !ret branch in the first patch since I
> think it would be more appropriate there, no?
Yes to all of that :)
>
> >
> >>
> >> /* It is safe to force: if it was not set but idals used
> >> * ccwchain_calc_length would have returned an error.
> >
> > The rest of the patch looks good to me.
> >
> >
>
next prev parent reply other threads:[~2019-07-09 14:19 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 20:10 [RFC v2 0/5] Some vfio-ccw fixes Farhan Ali
2019-07-08 20:10 ` [RFC v2 1/5] vfio-ccw: Fix misleading comment when setting orb.cmd.c64 Farhan Ali
2019-07-09 9:57 ` Cornelia Huck
2019-07-08 20:10 ` [RFC v2 2/5] vfio-ccw: Fix memory leak and don't call cp_free in cp_init Farhan Ali
2019-07-09 10:06 ` Cornelia Huck
2019-07-09 14:07 ` Farhan Ali
2019-07-09 14:18 ` Cornelia Huck [this message]
2019-07-08 20:10 ` [RFC v2 3/5] vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn Farhan Ali
2019-07-09 10:08 ` Cornelia Huck
2019-07-08 20:10 ` [RFC v2 4/5] vfio-ccw: Don't call cp_free if we are processing a channel program Farhan Ali
2019-07-09 10:16 ` Cornelia Huck
2019-07-09 13:46 ` Farhan Ali
2019-07-09 14:21 ` Halil Pasic
2019-07-09 21:27 ` Farhan Ali
2019-07-10 13:45 ` Cornelia Huck
2019-07-10 16:10 ` Farhan Ali
2019-07-11 12:28 ` Eric Farman
2019-07-11 14:57 ` Halil Pasic
2019-07-11 20:09 ` Eric Farman
2019-07-12 13:59 ` Halil Pasic
2019-07-08 20:10 ` [RFC v2 5/5] vfio-ccw: Update documentation for csch/hsch Farhan Ali
2019-07-09 10:14 ` Cornelia Huck
2019-07-09 12:47 ` Farhan Ali
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=20190709161856.269aca0d.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=alifm@linux.ibm.com \
--cc=farman@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.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 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.