From: Alan <gnomes@lxorguk.ukuu.org.uk>
Date: Tue, 3 Dec 2013 16:11:04 +0000 (+0000)
Subject: [SCSI] mac_scsi: Fix crash on out of memory
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=603f202e9eb083671f35f07cfe6be3e062c7ee31;p=deliverable%2Flinux.git

[SCSI] mac_scsi: Fix crash on out of memory

Missing check on scsi_register

Signed-off-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 858075723c87..f5cdc68cd5b6 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -260,6 +260,8 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)
     /* Once we support multiple 5380s (e.g. DuoDock) we'll do
        something different here */
     instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata));
+    if (instance == NULL)
+	return 0;
 
     if (macintosh_config->ident == MAC_MODEL_IIFX) {
 	mac_scsi_regp  = via1+0x8000;