* [PATCH v4.9 backport] KVM: arm/arm64: vgic-its: Preserve the revious read from the pending table
@ 2017-12-12 16:42 Christoffer Dall
2017-12-12 16:53 ` Christoffer Dall
0 siblings, 1 reply; 5+ messages in thread
From: Christoffer Dall @ 2017-12-12 16:42 UTC (permalink / raw)
To: stable; +Cc: Marc Zyngier, gregkh, Christoffer Dall
From: Marc Zyngier <marc.zyngier@arm.com>
Commit 64afe6e9eb4841f35317da4393de21a047a883b3 upstream.
The current pending table parsing code assumes that we keep the
previous read of the pending bits, but keep that variable in
the current block, making sure it is discarded on each loop.
We end-up using whatever is on the stack. Who knows, it might
just be the right thing...
Fixes: 33d3bc9556a7d ("KVM: arm64: vgic-its: Read initial LPI pending table")
Cc: <stable@vger.kernel.org> # 4.8
Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
virt/kvm/arm/vgic/vgic-its.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 4660a7d04eea..bbd4a988e8c1 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -322,6 +322,7 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
int ret = 0;
u32 *intids;
int nr_irqs, i;
+ u8 pendmask;
nr_irqs = vgic_copy_lpi_list(vcpu->kvm, &intids);
if (nr_irqs < 0)
@@ -329,7 +330,6 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
for (i = 0; i < nr_irqs; i++) {
int byte_offset, bit_nr;
- u8 pendmask;
byte_offset = intids[i] / BITS_PER_BYTE;
bit_nr = intids[i] % BITS_PER_BYTE;
--
2.14.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v4.9 backport] KVM: arm/arm64: vgic-its: Preserve the revious read from the pending table
2017-12-12 16:42 Christoffer Dall
@ 2017-12-12 16:53 ` Christoffer Dall
2017-12-12 16:55 ` Christoffer Dall
0 siblings, 1 reply; 5+ messages in thread
From: Christoffer Dall @ 2017-12-12 16:53 UTC (permalink / raw)
To: Stable; +Cc: Marc Zyngier, gregkh@linuxfoundation.org, Christoffer Dall
On Tue, Dec 12, 2017 at 5:42 PM, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> From: Marc Zyngier <marc.zyngier@arm.com>
>
> Commit 64afe6e9eb4841f35317da4393de21a047a883b3 upstream.
Please disregard this, I accidentally backported the arm64 patch
instead of the arm patch.
Another one (the correct one, hopefully) incoming.
>
> The current pending table parsing code assumes that we keep the
> previous read of the pending bits, but keep that variable in
> the current block, making sure it is discarded on each loop.
>
> We end-up using whatever is on the stack. Who knows, it might
> just be the right thing...
>
> Fixes: 33d3bc9556a7d ("KVM: arm64: vgic-its: Read initial LPI pending table")
> Cc: <stable@vger.kernel.org> # 4.8
> Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
> ---
> virt/kvm/arm/vgic/vgic-its.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
> index 4660a7d04eea..bbd4a988e8c1 100644
> --- a/virt/kvm/arm/vgic/vgic-its.c
> +++ b/virt/kvm/arm/vgic/vgic-its.c
> @@ -322,6 +322,7 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
> int ret = 0;
> u32 *intids;
> int nr_irqs, i;
> + u8 pendmask;
>
> nr_irqs = vgic_copy_lpi_list(vcpu->kvm, &intids);
> if (nr_irqs < 0)
> @@ -329,7 +330,6 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
>
> for (i = 0; i < nr_irqs; i++) {
> int byte_offset, bit_nr;
> - u8 pendmask;
>
> byte_offset = intids[i] / BITS_PER_BYTE;
> bit_nr = intids[i] % BITS_PER_BYTE;
> --
> 2.14.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4.9 backport] KVM: arm/arm64: vgic-its: Preserve the revious read from the pending table
2017-12-12 16:53 ` Christoffer Dall
@ 2017-12-12 16:55 ` Christoffer Dall
0 siblings, 0 replies; 5+ messages in thread
From: Christoffer Dall @ 2017-12-12 16:55 UTC (permalink / raw)
To: Stable; +Cc: Marc Zyngier, gregkh@linuxfoundation.org, Christoffer Dall
On Tue, Dec 12, 2017 at 5:53 PM, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> On Tue, Dec 12, 2017 at 5:42 PM, Christoffer Dall
> <christoffer.dall@linaro.org> wrote:
>> From: Marc Zyngier <marc.zyngier@arm.com>
>>
>> Commit 64afe6e9eb4841f35317da4393de21a047a883b3 upstream.
>
> Please disregard this, I accidentally backported the arm64 patch
> instead of the arm patch.
>
> Another one (the correct one, hopefully) incoming.
>
Actually, do NOT disregard this one, but apply this one.
I'll reply to the patch that you should actually disregard.
Not my day I guess.
Sorry,
-Christoffer
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v4.9 backport] KVM: arm/arm64: vgic-its: Preserve the revious read from the pending table
@ 2017-12-14 21:04 Christoffer Dall
2017-12-14 21:26 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Christoffer Dall @ 2017-12-14 21:04 UTC (permalink / raw)
To: stable; +Cc: Marc Zyngier, gregkh, Christoffer Dall
From: Marc Zyngier <marc.zyngier@arm.com>
Commit 64afe6e9eb4841f35317da4393de21a047a883b3 upstream.
The current pending table parsing code assumes that we keep the
previous read of the pending bits, but keep that variable in
the current block, making sure it is discarded on each loop.
We end-up using whatever is on the stack. Who knows, it might
just be the right thing...
Fixes: 33d3bc9556a7d ("KVM: arm64: vgic-its: Read initial LPI pending table")
Cc: <stable@vger.kernel.org> # 4.8
Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
virt/kvm/arm/vgic/vgic-its.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 4660a7d04eea..bbd4a988e8c1 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -322,6 +322,7 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
int ret = 0;
u32 *intids;
int nr_irqs, i;
+ u8 pendmask;
nr_irqs = vgic_copy_lpi_list(vcpu->kvm, &intids);
if (nr_irqs < 0)
@@ -329,7 +330,6 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
for (i = 0; i < nr_irqs; i++) {
int byte_offset, bit_nr;
- u8 pendmask;
byte_offset = intids[i] / BITS_PER_BYTE;
bit_nr = intids[i] % BITS_PER_BYTE;
--
2.14.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v4.9 backport] KVM: arm/arm64: vgic-its: Preserve the revious read from the pending table
2017-12-14 21:04 [PATCH v4.9 backport] KVM: arm/arm64: vgic-its: Preserve the revious read from the pending table Christoffer Dall
@ 2017-12-14 21:26 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2017-12-14 21:26 UTC (permalink / raw)
To: Christoffer Dall; +Cc: stable, Marc Zyngier
On Thu, Dec 14, 2017 at 10:04:23PM +0100, Christoffer Dall wrote:
> From: Marc Zyngier <marc.zyngier@arm.com>
>
> Commit 64afe6e9eb4841f35317da4393de21a047a883b3 upstream.
>
> The current pending table parsing code assumes that we keep the
> previous read of the pending bits, but keep that variable in
> the current block, making sure it is discarded on each loop.
>
> We end-up using whatever is on the stack. Who knows, it might
> just be the right thing...
>
> Fixes: 33d3bc9556a7d ("KVM: arm64: vgic-its: Read initial LPI pending table")
> Cc: <stable@vger.kernel.org> # 4.8
> Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
> ---
> virt/kvm/arm/vgic/vgic-its.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Now applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-14 21:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-14 21:04 [PATCH v4.9 backport] KVM: arm/arm64: vgic-its: Preserve the revious read from the pending table Christoffer Dall
2017-12-14 21:26 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2017-12-12 16:42 Christoffer Dall
2017-12-12 16:53 ` Christoffer Dall
2017-12-12 16:55 ` Christoffer Dall
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).