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

Commit 35bf7692 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: fix format string in debug prints 



buf_idx type was changed to size_t, and few places
missed out to change the print format from %ld to %zu.
Use also uz for buf.size which is also of size_t

Fixes:
commit 56988f22e097 ("mei: fix possible integer overflow issue")'

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 941943cf

drivers/misc/mei/amthif.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, 
		 * remove message from deletion list

		 */



	dev_dbg(dev->dev, "amthif cb->buf.size - %zd cb->buf_idx - %zd\n",

	dev_dbg(dev->dev, "amthif cb->buf.size - %zu cb->buf_idx - %zu\n",

		cb->buf.size, cb->buf_idx);



	/* length is being truncated to PAGE_SIZE, however,

drivers/misc/mei/client.c

+1 −1
Original line number Diff line number Diff line
@@ -1583,7 +1583,7 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb, 
		return 0;

	}



	cl_dbg(dev, cl, "buf: size = %zd idx = %zd\n",

	cl_dbg(dev, cl, "buf: size = %zu idx = %zu\n",

			cb->buf.size, cb->buf_idx);



	rets = mei_write_message(dev, &mei_hdr, buf->data + cb->buf_idx);

drivers/misc/mei/interrupt.c

+3 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, 
	buf_sz = mei_hdr->length + cb->buf_idx;

	/* catch for integer overflow */

	if (buf_sz < cb->buf_idx) {

		cl_err(dev, cl, "message is too big len %d idx %ld\n",

		cl_err(dev, cl, "message is too big len %d idx %zu\n",

		       mei_hdr->length, cb->buf_idx);



		list_move_tail(&cb->list, &complete_list->list);
@@ -137,7 +137,7 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, 
	}



	if (cb->buf.size < buf_sz) {

		cl_dbg(dev, cl, "message overflow. size %zd len %d idx %zd\n",

		cl_dbg(dev, cl, "message overflow. size %zu len %d idx %zu\n",

			cb->buf.size, mei_hdr->length, cb->buf_idx);

		buffer = krealloc(cb->buf.data, buf_sz, GFP_KERNEL);
@@ -156,7 +156,7 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, 
	cb->buf_idx += mei_hdr->length;



	if (mei_hdr->msg_complete) {

		cl_dbg(dev, cl, "completed read length = %lu\n", cb->buf_idx);

		cl_dbg(dev, cl, "completed read length = %zu\n", cb->buf_idx);

		list_move_tail(&cb->list, &complete_list->list);

	} else {

		pm_runtime_mark_last_busy(dev->dev);

drivers/misc/mei/main.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, 
		goto free;

	}



	cl_dbg(dev, cl, "buf.size = %zd buf.idx = %zd offset = %lld\n",

	cl_dbg(dev, cl, "buf.size = %zu buf.idx = %zu offset = %lld\n",

	       cb->buf.size, cb->buf_idx, *offset);

	if (*offset >= cb->buf_idx) {

		rets = 0;