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: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 04525ada9eda449097cb6b9b0c85aa02a5c0e177..194360a5f7823331e1cff910edb31ea0e14514ba 100644 (file)
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -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,

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index a9cdb92b52d198560db02cd1c0179275facfb90e..bab17e4197b68b4763bf05a92d14ffffbaf70f4a 100644 (file)
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -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);

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 06b744a503a3731bd03dc8c06bda6de95ef05f64..1e5cb1f704f809d56c350969953567e091203227 100644 (file)
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -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);

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 7e637eb46cb9e97a7902010a55c03baaf57bd047..52635b063873ac1289b22c8987a5e115c37dc4cc 100644 (file)
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -221,7 +221,7 @@ copy_buffer:
                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;