[3/3,RESEND] ipr: Fix invalid array indexing for HRRQ

Commit Message

Brian King July 14, 2015, 4:41 p.m. UTC

Fixes another signed / unsigned array indexing bug in the ipr driver.
Currently, when hrrq_index wraps, it becomes a negative number. We
do the modulo, but still have a negative number, so we end up indexing
backwards in the array. Given where the hrrq array is located in memory,
we probably won't actually reference memory we don't own, but nonetheless
ipr is still looking at data within struct ipr_ioa_cfg and interpreting it as
struct ipr_hrr_queue data, so bad things could certainly happen.

Each ipr adapter has anywhere from 1 to 16 HRRQs. By default, we use 2 on new adapters.
Let's take an example:

Assume ioa_cfg->hrrq_index=0x7fffffffe and ioa_cfg->hrrq_num=4:

The atomic_add_return will then return -1. We mod this with 3 and get -2, add one and
get -1 for an array index.

On adapters which support more than a single HRRQ, we dedicate HRRQ to adapter
initialization and error interrupts so that we can optimize the other queues for
fast path I/O. So all normal I/O uses HRRQ 1-15. So we want to spread the I/O
requests across those HRRQs.

With the default module parameter settings, this bug won't hit, only when someone
sets the ipr.number_of_msix parameter to a value larger than 3 is when bad things
start to happen.

Cc: <[e-mail]>
Tested-by: Wen Xiong <[e-mail]>
Reviewed-by: Wen Xiong <[e-mail]> 
Reviewed-by: Gabriel Krisman Bertazi <[e-mail]>
Signed-off-by: Brian King <[e-mail]>
---

 drivers/scsi/ipr.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Martin K. Petersen July 17, 2015, 2 a.m. UTC | #1

>>>>> "Brian" == Brian King <[e-mail]> writes:

Brian> Fixes another signed / unsigned array indexing bug in the ipr
Brian> driver.  Currently, when hrrq_index wraps, it becomes a negative
Brian> number. We do the modulo, but still have a negative number, so we
Brian> end up indexing backwards in the array. Given where the hrrq
Brian> array is located in memory, we probably won't actually reference
Brian> memory we don't own, but nonetheless ipr is still looking at data
Brian> within struct ipr_ioa_cfg and interpreting it as struct
Brian> ipr_hrr_queue data, so bad things could certainly happen.

Reviewed-by: Martin K. Petersen <[e-mail]>

Patch

diff -puN drivers/scsi/ipr.c~ipr_hrrq_index_fix drivers/scsi/ipr.c
--- linux/drivers/scsi/ipr.c~ipr_hrrq_index_fix	2015-07-14 11:12:59.029505136 -0500
+++ linux-bjking1/drivers/scsi/ipr.c	2015-07-14 11:12:59.036505101 -0500
@@ -1052,10 +1052,15 @@  static void ipr_send_blocking_cmd(struct
 
 static int ipr_get_hrrq_index(struct ipr_ioa_cfg *ioa_cfg)
 {
+	unsigned int hrrq;
+
 	if (ioa_cfg->hrrq_num == 1)
-		return 0;
-	else
-		return (atomic_add_return(1, &ioa_cfg->hrrq_index) % (ioa_cfg->hrrq_num - 1)) + 1;
+		hrrq = 0;
+	else {
+		hrrq = atomic_add_return(1, &ioa_cfg->hrrq_index);
+		hrrq = (hrrq % (ioa_cfg->hrrq_num - 1)) + 1;
+	}
+	return hrrq;
 }
 
 /**