Commit 010904cb authored Jul 17, 2007 by Vasily Averin Committed by Linus Torvalds Jul 17, 2007

wrong memory access in i2o_block_device_lock()



This patch fixes access to memory that has not been allocated:
i2o_msg_get_wait() can returns errors different from I2O_QUEUE_EMPTY.  But the
result is checked only against this code.  If it is not I2O_QUEUE_EMPTY then
we dereference the error code as the pointer later.

Signed-off-by: Vasily Averin <vvs@sw.ru>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Acked-by: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 1725d71d

drivers/message/i2o/i2o_block.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ static int i2o_block_device_lock(struct i2o_device *dev, u32 media_id)
		struct i2o_message *msg;

		msg = i2o_msg_get_wait(dev->iop, I2O_TIMEOUT_MESSAGE_GET);
		if (IS_ERR(msg) == I2O_QUEUE_EMPTY)
		if (IS_ERR(msg))
		return PTR_ERR(msg);

		msg->u.head[0] = cpu_to_le32(FIVE_WORD_MSG_SIZE \| SGL_OFFSET_0);