Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23231048 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley
Browse files

[SCSI] hpsa: Fix hpsa_find_scsi_entry so that it doesn't try to dereference NULL pointers 



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent c7f172dc

drivers/scsi/hpsa.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -776,6 +776,8 @@ static int hpsa_scsi_find_entry(struct hpsa_scsi_dev_t *needle, 
#define DEVICE_CHANGED 1

#define DEVICE_CHANGED 1

#define DEVICE_SAME 2

#define DEVICE_SAME 2

	for (i = 0; i < haystack_size; i++) {

	for (i = 0; i < haystack_size; i++) {

		if (haystack[i] == NULL) /* previously removed. */

			continue;

		if (SCSI3ADDR_EQ(needle->scsi3addr, haystack[i]->scsi3addr)) {

		if (SCSI3ADDR_EQ(needle->scsi3addr, haystack[i]->scsi3addr)) {

			*index = i;

			*index = i;

			if (device_is_the_same(needle, haystack[i]))

			if (device_is_the_same(needle, haystack[i]))