Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1336216 > unrolled thread

[char-misc-next] mei: fix format string in debug prints

Back to article view | Back to linux.kernel

Contents

  [char-misc-next] mei: fix format string in debug prints Tomas Winkler <tomas.winkler@intel.com> - 2016-02-17 11:30 +0100
    Re: [char-misc-next] mei: fix format string in debug prints Joe Perches <joe@perches.com> - 2016-02-17 11:50 +0100
      RE: [char-misc-next] mei: fix format string in debug prints "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-02-17 13:10 +0100

#1336216 — [char-misc-next] mei: fix format string in debug prints

From: Alexander Usyskin <alexander.usyskin@intel.com>

buf_idx type was changed to size_t, and few places
missed out to change the print format from %ld to %zd.

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>
---
 drivers/misc/mei/interrupt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 06b744a503a3..ede42b43e62e 100644
--- 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 %zd\n",
 		       mei_hdr->length, cb->buf_idx);
 
 		list_move_tail(&cb->list, &complete_list->list);
@@ -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 = %zd\n", cb->buf_idx);
 		list_move_tail(&cb->list, &complete_list->list);
 	} else {
 		pm_runtime_mark_last_busy(dev->dev);
-- 
2.4.3

[toc] | [next] | [standalone]

#1336246

On Wed, 2016-02-17 at 12:27 +0200, Tomas Winkler wrote:
[]
> buf_idx type was changed to size_t, and few places
> missed out to change the print format from %ld to %zd.

trivia:

> diff --git 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 %zd\n",
>  		       mei_hdr->length, cb->buf_idx);

[etc...]

buf_idx is size_t and it should probably use %zu

ssize_t -> %zd
size_t -> %zu

[toc] | [prev] | [next] | [standalone]

#1336302

> 
> On Wed, 2016-02-17 at 12:27 +0200, Tomas Winkler wrote:
> []
> > buf_idx type was changed to size_t, and few places
> > missed out to change the print format from %ld to %zd.
> 
> trivia:
> 
> > diff --git 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 %zd\n",
> >  		       mei_hdr->length, cb->buf_idx);
> 
> 
> 
> buf_idx is size_t and it should probably use %zu
> 
> ssize_t -> %zd
> size_t -> %zu

Thanks, will fix.
Tomas 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web