Patch "memstick: mspro_block: add missing curly braces" has been added to the 3.19-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
memstick: mspro_block: add missing curly braces
to the 3.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
memstick-mspro_block-add-missing-curly-braces.patch
and it can be found in the queue-3.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
13f6b191aaa11c7fd718d35a0c565f3c16bc1d99Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Thu, 16 Apr 2015 12:48:35 -0700
Subject: memstick: mspro_block: add missing curly braces
From: Dan Carpenter <[email protected]>
commit 13f6b191aaa11c7fd718d35a0c565f3c16bc1d99 upstream.
Using the indenting we can see the curly braces were obviously intended. This is a static checker fix, but my guess is that we don't read enough bytes, because we don't calculate "t_len" correctly.
--- drivers/memstick/core/mspro_block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/memstick/core/mspro_block.c +2 -1
@@ -758,7 +758,7 @@ static int mspro_block_complete_req(struif (error || (card->current_mrq.tpc ==MSPRO_CMD_STOP )) {if (msb->data_dir ==READ ) { -for (cnt =0 ; cnt < msb->current_seg; cnt++) +for (cnt =0 ; cnt < msb->current_seg; cnt++) { t_len += msb->req_sg[cnt].length / msb->page_size;
@@ -766,6 +766,7 @@ static int mspro_block_complete_req(stru t_len += msb->current_page -1 ; t_len *= msb->page_size; + } } }else t_len =blk_rq_bytes (msb->block_req);
Patches currently in stable-queue which might be from [email protected] are
queue-3.19/memstick-mspro_block-add-missing-curly-braces.patch