All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>, kvm-ppc@vger.kernel.org
Subject: [PATCH v2 1/9] KVM: PPC: Book3S HV: Fix H_REGISTER_VPA VPA size validation
Date: Sun, 13 Aug 2017 01:33:38 +0000	[thread overview]
Message-ID: <20170813013346.14002-1-npiggin@gmail.com> (raw)
In-Reply-To: <20170812113416.15978-1-npiggin@gmail.com>

KVM currently validates the size of the VPA registered by the client
against sizeof(struct lppaca), however we align (and therefore size)
that struct to 1kB to avoid crossing a 4kB boundary in the client.

PAPR calls for sizes >= 640 bytes to be accepted. Hard code this with
a comment.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kvm/book3s_hv.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 359c79cdf0cc..1182cfd79857 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -485,7 +485,13 @@ static unsigned long do_h_register_vpa(struct kvm_vcpu *vcpu,
 
 	switch (subfunc) {
 	case H_VPA_REG_VPA:		/* register VPA */
-		if (len < sizeof(struct lppaca))
+		/*
+		 * The size of our lppaca is 1kB because of the way we align
+		 * it for the guest to avoid crossing a 4kB boundary. We only
+		 * use 640 bytes of the structure though, so we should accept
+		 * clients that set a size of 640.
+		 */
+		if (len < 640)
 			break;
 		vpap = &tvcpu->arch.vpa;
 		err = 0;
-- 
2.13.3


WARNING: multiple messages have this Message-ID (diff)
From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>, kvm-ppc@vger.kernel.org
Subject: [PATCH v2 1/9] KVM: PPC: Book3S HV: Fix H_REGISTER_VPA VPA size validation
Date: Sun, 13 Aug 2017 11:33:38 +1000	[thread overview]
Message-ID: <20170813013346.14002-1-npiggin@gmail.com> (raw)
In-Reply-To: <20170812113416.15978-1-npiggin@gmail.com>

KVM currently validates the size of the VPA registered by the client
against sizeof(struct lppaca), however we align (and therefore size)
that struct to 1kB to avoid crossing a 4kB boundary in the client.

PAPR calls for sizes >= 640 bytes to be accepted. Hard code this with
a comment.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kvm/book3s_hv.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 359c79cdf0cc..1182cfd79857 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -485,7 +485,13 @@ static unsigned long do_h_register_vpa(struct kvm_vcpu *vcpu,
 
 	switch (subfunc) {
 	case H_VPA_REG_VPA:		/* register VPA */
-		if (len < sizeof(struct lppaca))
+		/*
+		 * The size of our lppaca is 1kB because of the way we align
+		 * it for the guest to avoid crossing a 4kB boundary. We only
+		 * use 640 bytes of the structure though, so we should accept
+		 * clients that set a size of 640.
+		 */
+		if (len < 640)
 			break;
 		vpap = &tvcpu->arch.vpa;
 		err = 0;
-- 
2.13.3

  reply	other threads:[~2017-08-13  1:33 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-12 11:34 [PATCH v2 0/9] improve early structure allocations (paca, lppaca, etc) Nicholas Piggin
2017-08-12 11:34 ` Nicholas Piggin
2017-08-13  1:33 ` Nicholas Piggin [this message]
2017-08-13  1:33   ` [PATCH v2 1/9] KVM: PPC: Book3S HV: Fix H_REGISTER_VPA VPA size validation Nicholas Piggin
2017-08-15 11:24   ` Michael Ellerman
2017-08-15 11:24     ` Michael Ellerman
2017-08-31  3:41   ` Paul Mackerras
2017-08-31  3:41     ` Paul Mackerras
2017-08-13  1:33 ` [PATCH v2 2/9] powerpc/powernv: powernv platform is not constrained by RMA Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin
2017-08-31 11:36   ` [v2,2/9] " Michael Ellerman
2017-08-31 11:36     ` [v2, 2/9] " Michael Ellerman
2017-08-13  1:33 ` [PATCH v2 3/9] powerpc/powernv: Remove real mode access limit for early allocations Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin
2017-08-14 12:49   ` Michael Ellerman
2017-08-14 13:10     ` Benjamin Herrenschmidt
2017-08-14 13:10       ` Benjamin Herrenschmidt
2017-08-14 14:51       ` Nicholas Piggin
2017-08-14 14:51         ` Nicholas Piggin
2017-08-14 13:13     ` Benjamin Herrenschmidt
2017-08-14 13:13       ` Benjamin Herrenschmidt
2017-08-15 12:10       ` Nicholas Piggin
2017-08-15 12:10         ` Nicholas Piggin
2017-08-15 12:48         ` Benjamin Herrenschmidt
2017-08-15 12:48           ` Benjamin Herrenschmidt
2017-08-15 13:02           ` Nicholas Piggin
2017-08-15 13:02             ` Nicholas Piggin
2017-09-12 10:13       ` Aneesh Kumar K.V
2017-09-12 10:25         ` Aneesh Kumar K.V
2017-09-12 10:26         ` Benjamin Herrenschmidt
2017-09-12 10:26           ` Benjamin Herrenschmidt
2017-08-13  1:33 ` [PATCH v2 4/9] powerpc/64s/radix: Remove bolted-SLB address limit for per-cpu stacks Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin
2017-08-31 11:36   ` [v2, " Michael Ellerman
2017-08-31 11:36     ` Michael Ellerman
2017-08-13  1:33 ` [PATCH v2 5/9] powerpc/64s: Relax PACA address limitations Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin
2017-08-13  1:33 ` [PATCH v2 6/9] powerpc/64s/radix: Do not allocate SLB shadow structures Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin
2017-08-31 11:36   ` [v2,6/9] " Michael Ellerman
2017-08-31 11:36     ` [v2, 6/9] " Michael Ellerman
2017-08-13  1:33 ` [PATCH v2 7/9] powerpc/64s: do not allocate lppaca if we are not virtualized Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin
2017-10-13 22:47   ` Paul Mackerras
2017-10-13 22:47     ` Paul Mackerras
2017-10-14  3:54     ` Nicholas Piggin
2017-10-14  3:54       ` Nicholas Piggin
2017-08-13  1:33 ` [PATCH v2 8/9] powerpc/64: Use a table of paca pointers and allocate pacas individually Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin
2017-08-15 15:50   ` Nicholas Piggin
2017-08-15 15:50     ` Nicholas Piggin
2017-08-15 17:30   ` kbuild test robot
2017-08-15 17:30     ` kbuild test robot
2017-08-13  1:33 ` [PATCH v2 9/9] powerpc/64: Use a table of lppaca pointers and allocate lppacas individually Nicholas Piggin
2017-08-13  1:33   ` Nicholas Piggin

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=20170813013346.14002-1-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=kvm-ppc@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.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 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.