From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alan Subject: [PATCH] scsi: Fix crash on out of memory with MAC SCSI Date: Tue, 03 Dec 2013 16:11:04 +0000 Message-ID: <20131203161036.2197.73730.stgit@alan.etchedpixels.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:52395 "EHLO alan.etchedpixels.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751977Ab3LCQTq (ORCPT ); Tue, 3 Dec 2013 11:19:46 -0500 Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: jbottomley@parallels.com, linux-scsi@vger.kernel.org From: Alan Missing check on scsi_register Signed-off-by: Alan Cox --- drivers/scsi/mac_scsi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 8580757..f5cdc68 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;