* [Qemu-devel] [PATCH] spapr_vscsi: Error handling fixes
@ 2012-06-19 6:02 Benjamin Herrenschmidt
2012-06-19 11:31 ` Andreas Färber
2012-06-19 20:57 ` Alexander Graf
0 siblings, 2 replies; 6+ messages in thread
From: Benjamin Herrenschmidt @ 2012-06-19 6:02 UTC (permalink / raw)
To: qemu-devel@nongnu.org; +Cc: kvm, kvm-ppc, Alexander Graf
We were incorrectly g_free'ing an object that isn't allocated
in one error path and failed to release it completely in another
This fixes qemu crashes with some cases of IO errors.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
hw/spapr_vscsi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index d2fe3e5..6afc3b4 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -801,6 +801,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq)
if (crq->s.IU_length > sizeof(union viosrp_iu)) {
fprintf(stderr, "VSCSI: SRP IU too long (%d bytes) !\n",
crq->s.IU_length);
+ vscsi_put_req(req);
return;
}
@@ -808,7 +809,8 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq)
if (spapr_vio_dma_read(&s->vdev, crq->s.IU_data_ptr, &req->iu,
crq->s.IU_length)) {
fprintf(stderr, "vscsi_got_payload: DMA read failure !\n");
- g_free(req);
+ vscsi_put_req(req);
+ return;
}
memcpy(&req->crq, crq, sizeof(vscsi_crq));
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] spapr_vscsi: Error handling fixes
2012-06-19 6:02 [Qemu-devel] [PATCH] spapr_vscsi: Error handling fixes Benjamin Herrenschmidt
@ 2012-06-19 11:31 ` Andreas Färber
2012-06-19 20:18 ` Benjamin Herrenschmidt
2012-06-19 20:57 ` Alexander Graf
1 sibling, 1 reply; 6+ messages in thread
From: Andreas Färber @ 2012-06-19 11:31 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: kvm-ppc, qemu-devel@nongnu.org, kvm, Alexander Graf
Am 19.06.2012 08:02, schrieb Benjamin Herrenschmidt:
> We were incorrectly g_free'ing an object that isn't allocated
> in one error path and failed to release it completely in another
>
> This fixes qemu crashes with some cases of IO errors.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> hw/spapr_vscsi.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
> index d2fe3e5..6afc3b4 100644
> --- a/hw/spapr_vscsi.c
> +++ b/hw/spapr_vscsi.c
> @@ -801,6 +801,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq)
> if (crq->s.IU_length > sizeof(union viosrp_iu)) {
> fprintf(stderr, "VSCSI: SRP IU too long (%d bytes) !\n",
> crq->s.IU_length);
> + vscsi_put_req(req);
> return;
> }
>
> @@ -808,7 +809,8 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq)
> if (spapr_vio_dma_read(&s->vdev, crq->s.IU_data_ptr, &req->iu,
> crq->s.IU_length)) {
> fprintf(stderr, "vscsi_got_payload: DMA read failure !\n");
> - g_free(req);
> + vscsi_put_req(req);
> + return;
Tab alert. :)
/-F
> }
> memcpy(&req->crq, crq, sizeof(vscsi_crq));
>
>
>
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] spapr_vscsi: Error handling fixes
2012-06-19 6:02 [Qemu-devel] [PATCH] spapr_vscsi: Error handling fixes Benjamin Herrenschmidt
2012-06-19 11:31 ` Andreas Färber
@ 2012-06-19 20:57 ` Alexander Graf
1 sibling, 0 replies; 6+ messages in thread
From: Alexander Graf @ 2012-06-19 20:57 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: qemu-devel@nongnu.org, kvm-ppc, kvm
On 19.06.2012, at 08:02, Benjamin Herrenschmidt wrote:
> We were incorrectly g_free'ing an object that isn't allocated
> in one error path and failed to release it completely in another
>
> This fixes qemu crashes with some cases of IO errors.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Thanks, applied to ppc-next.
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-19 20:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-19 6:02 [Qemu-devel] [PATCH] spapr_vscsi: Error handling fixes Benjamin Herrenschmidt
2012-06-19 11:31 ` Andreas Färber
2012-06-19 20:18 ` Benjamin Herrenschmidt
2012-06-19 20:20 ` Alexander Graf
2012-06-19 20:46 ` Benjamin Herrenschmidt
2012-06-19 20:57 ` Alexander Graf
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).