Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e6acd0 authored by Xianbin Zhu's avatar Xianbin Zhu
Browse files

i2c: virtio: reallocate memory for each msg buffer 



We'd better reallocate memory for each msg buffer to avoid
the memory in stack space be transferred to the backend for
the driver of i2c virtualization.

Change-Id: I6daa58cf819d4f612ae246b5a685898e28fbeb54
Signed-off-by: default avatarXianbin Zhu <xianzhu@codeaurora.org>
parent 8054e688

drivers/i2c/busses/virtio-i2c.c

+20 −13
Original line number Diff line number Diff line
@@ -130,20 +130,28 @@ static int virti2c_transfer_prepare(struct i2c_msg *msg_1, 
	i2c_req->head.length = msg_1->len;



	if (IS_ERR_OR_NULL(msg_2)) {

		i2c_req->head.type = (msg_1->flags & I2C_M_RD) ?

					I2C_VIRTIO_RD : I2C_VIRTIO_WR;

		i2c_req->buf = msg_1->buf;

		i2c_req->buf = kzalloc(msg_1->len, GFP_KERNEL);

		if (!i2c_req->buf)

			return -ENOMEM;



		if (msg_1->flags & I2C_M_RD) {

			i2c_req->head.type = I2C_VIRTIO_RD;

		} else {

			i2c_req->head.type = I2C_VIRTIO_WR;

			memcpy(i2c_req->buf, msg_1->buf, msg_1->len);

		}



	} else {

		if (!msg_2->len || IS_ERR_OR_NULL(msg_2->buf))

			return -EINVAL;



		i2c_req->head.type = I2C_VIRTIO_RDWR;

		i2c_req->head.total_length = msg_1->len + msg_2->len;



		i2c_req->buf = kzalloc((msg_1->len + msg_2->len), GFP_KERNEL);

		if (IS_ERR_OR_NULL(i2c_req->buf))

		if (!i2c_req->buf)

			return -ENOMEM;



		i2c_req->head.type = I2C_VIRTIO_RDWR;

		i2c_req->head.total_length = msg_1->len + msg_2->len;



		memcpy(i2c_req->buf, msg_1->buf, msg_1->len);

	}
@@ -153,15 +161,14 @@ static int virti2c_transfer_prepare(struct i2c_msg *msg_1, 
static void virti2c_transfer_end(struct virtio_i2c_req *req,

						struct i2c_msg *msg)

{

	if (req->head.type == I2C_VIRTIO_RDWR) {

	if (req->head.type == I2C_VIRTIO_RDWR)

		memcpy(msg->buf, req->buf + req->head.length, msg->len);

	else if (req->head.type == I2C_VIRTIO_RD)

		memcpy(msg->buf, req->buf, msg->len);

	kfree(req->buf);

	req->buf = NULL;

}



	memset(req, 0, sizeof(struct virtio_i2c_req));

}



static int virtio_i2c_master_xfer(struct i2c_adapter *adap,

				struct i2c_msg *msgs, int num)

{