+ cciss-fix-problem-that-deleting-multiple-logical-drives-could-cause-a-panic.patch added to -mm tree

[akpm@linux-foundation.org]

The patch titled
     cciss: fix problem that deleting multiple logical drives could cause a panic
has been added to the -mm tree.  Its filename is
     cciss-fix-problem-that-deleting-multiple-logical-drives-could-cause-a-panic.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: cciss: fix problem that deleting multiple logical drives could cause a panic
From: Stephen M. Cameron <scameron@beardog.cca.cpqcorp.net>

Fix problem that deleting multiple logical drives could cause a panic.

It fixes a panic which can be easily reproduced in the following way: Just
create several "arrays," each with multiple logical drives via hpacucli,
then delete the first array, and it will blow up in deregister_disk(), in
the call to get_host() when it tries to dig the hba pointer out of a NULL
queue pointer.

The problem has been present since my code to make rebuild_lun_table
behave better went in.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cca.cpqcorp.net>
Jens Axboe <jens.axboe@oracle.com>
Cc: <stable@kernel.org>		[2.6.27.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/block/cciss.c |    5 +++++
 1 file changed, 5 insertions(+)

diff -puN drivers/block/cciss.c~cciss-fix-problem-that-deleting-multiple-logical-drives-could-cause-a-panic drivers/block/cciss.c
--- a/drivers/block/cciss.c~cciss-fix-problem-that-deleting-multiple-logical-drives-could-cause-a-panic
+++ a/drivers/block/cciss.c
@@ -1680,6 +1680,11 @@ static int rebuild_lun_table(ctlr_info_t
 	for (i = 0; i <= h->highest_lun; i++) {
 		int j;
 		drv_found = 0;
+
+		/* skip holes in the array from already deleted drives */
+		if (h->drv[i].raid_level == -1)
+			continue;
+
 		for (j = 0; j < num_luns; j++) {
 			memcpy(&lunid, &ld_buff->LUN[j][0], 4);
 			lunid = le32_to_cpu(lunid);
_

Patches currently in -mm which might be from scameron@beardog.cca.cpqcorp.net are

cciss-fix-problem-that-deleting-multiple-logical-drives-could-cause-a-panic.patch
cciss-simplify-parameters-to-deregister_disk-function.patch