Re: [patch] xen-blkback: add missing return on error in xen_update_blkif_status()

From: Laszlo Ersek
Date: Fri Aug 05 2011 - 11:04:47 EST


On 08/05/11 16:18, Dan Carpenter wrote:
We should return here after reporting the error. Otherwise we'd hit
a NULL deref of blkif->xenblkd on the next line.

Signed-off-by: Dan Carpenter<error27@xxxxxxxxx>

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 32d4c3c..b750299 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -107,6 +107,7 @@ static void xen_update_blkif_status(struct xen_blkif *blkif)
err = PTR_ERR(blkif->xenblkd);
blkif->xenblkd = NULL;
xenbus_dev_error(blkif->be->dev, err, "start xenblkd");
+ return;
}

blkif->be->kthread_pid = blkif->xenblkd->pid;

In case somebody were asking for my opinion:

I think this block was the last block in the originally containing function (update_blkif_status()?), thus the "return" wasn't needed there. I guess the block got copied and then other code was added below it.

Acked-by: Laszlo Ersek <lersek@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/