kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Farhan Ali <alifm@linux.ibm.com>
To: cohuck@redhat.com, farman@linux.ibm.com, pasic@linux.ibm.com
Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org, alifm@linux.ibm.com
Subject: [RFC v2 3/5] vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn
Date: Mon,  8 Jul 2019 16:10:36 -0400	[thread overview]
Message-ID: <452bf0756d8b0efdb9fd1e1aa5d8c0e6a7f31c03.1562616169.git.alifm@linux.ibm.com> (raw)
In-Reply-To: <cover.1562616169.git.alifm@linux.ibm.com>
In-Reply-To: <cover.1562616169.git.alifm@linux.ibm.com>

So we don't call try to call vfio_unpin_pages() incorrectly.

Fixes: 0a19e61e6d4c ("vfio: ccw: introduce channel program interfaces")
Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
---
 drivers/s390/cio/vfio_ccw_cp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c
index 31a04a5..1b93863 100644
--- a/drivers/s390/cio/vfio_ccw_cp.c
+++ b/drivers/s390/cio/vfio_ccw_cp.c
@@ -72,8 +72,10 @@ static int pfn_array_alloc(struct pfn_array *pa, u64 iova, unsigned int len)
 				  sizeof(*pa->pa_iova_pfn) +
 				  sizeof(*pa->pa_pfn),
 				  GFP_KERNEL);
-	if (unlikely(!pa->pa_iova_pfn))
+	if (unlikely(!pa->pa_iova_pfn)) {
+		pa->pa_nr = 0;
 		return -ENOMEM;
+	}
 	pa->pa_pfn = pa->pa_iova_pfn + pa->pa_nr;
 
 	pa->pa_iova_pfn[0] = pa->pa_iova >> PAGE_SHIFT;
-- 
2.7.4


  parent reply	other threads:[~2019-07-08 20:10 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
2019-07-08 20:10 ` Farhan Ali [this message]
2019-07-09 10:08   ` [RFC v2 3/5] vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn 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=452bf0756d8b0efdb9fd1e1aa5d8c0e6a7f31c03.1562616169.git.alifm@linux.ibm.com \
    --to=alifm@linux.ibm.com \
    --cc=cohuck@redhat.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 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).