From: Christoffer Dall <cdall@kernel.org>
To: kvmarm@lists.cs.columbia.edu,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
Marc Zyngier <marc.zyngier@arm.com>,
stable@vger.kernel.org,
Christoffer Dall <christoffer.dall@linaro.org>
Subject: [PULL 06/19] KVM: arm/arm64: vgic-its: Check result of allocation before use
Date: Mon, 4 Dec 2017 15:03:35 +0100 [thread overview]
Message-ID: <20171204140348.21965-4-cdall@kernel.org> (raw)
In-Reply-To: <20171204135637.21620-1-cdall@kernel.org>
From: Marc Zyngier <marc.zyngier@arm.com>
We miss a test against NULL after allocation.
Fixes: 6d03a68f8054 ("KVM: arm64: vgic-its: Turn device_id validation into generic ID validation")
Cc: <stable@vger.kernel.org> # 4.8
Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Acked-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, 2 insertions(+)
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index cb2d0a2dbe5a..8e633bd9cc1e 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -821,6 +821,8 @@ static int vgic_its_alloc_collection(struct vgic_its *its,
return E_ITS_MAPC_COLLECTION_OOR;
collection = kzalloc(sizeof(*collection), GFP_KERNEL);
+ if (!collection)
+ return -ENOMEM;
collection->collection_id = coll_id;
collection->target_addr = COLLECTION_NOT_MAPPED;
--
2.14.2
next prev parent reply other threads:[~2017-12-04 14:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20171204135637.21620-1-cdall@kernel.org>
2017-12-04 14:03 ` [PULL 03/19] KVM: arm/arm64: vgic-irqfd: Fix MSI entry allocation Christoffer Dall
2017-12-04 14:03 ` [PULL 04/19] KVM: arm/arm64: vgic: Preserve the revious read from the pending table Christoffer Dall
2017-12-04 14:03 ` [PULL 05/19] KVM: arm/arm64: vgic-its: " Christoffer Dall
2017-12-04 14:03 ` Christoffer Dall [this message]
2017-12-04 14:03 ` [PULL 08/19] arm64: KVM: fix VTTBR_BADDR_MASK BUG_ON off-by-one Christoffer Dall
2017-12-04 14:03 ` [PULL 09/19] arm: KVM: Fix " Christoffer Dall
2017-12-04 14:03 ` [PULL 19/19] KVM: arm/arm64: Fix broken GICH_ELRSR big endian conversion Christoffer Dall
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=20171204140348.21965-4-cdall@kernel.org \
--to=cdall@kernel.org \
--cc=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@arm.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=stable@vger.kernel.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 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).