From patchwork Tue Jun 19 06:02:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: spapr_vscsi: Error handling fixes Date: Mon, 18 Jun 2012 20:02:38 -0000 From: Benjamin Herrenschmidt X-Patchwork-Id: 165652 Message-Id: <1340085758.28143.4.camel@pasglop> To: "qemu-devel@nongnu.org" Cc: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, 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 --- hw/spapr_vscsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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));