Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp2020395imm; Thu, 24 May 2018 04:38:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqonJDvUjxf42hb36UVNlSdBqGBLfi6RQxBeY4H/zKeMfu7vSnOJd+sJnkpzSPV1V4fQRdm X-Received: by 2002:a65:4e85:: with SMTP id b5-v6mr5639004pgs.155.1527161907277; Thu, 24 May 2018 04:38:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527161907; cv=none; d=google.com; s=arc-20160816; b=uDlb9rzii7ISfs1lgKc6t8iZADR0uk0W5rA9B/l1N/Z8ZvOg1JbBMhE1kWOdhFgant P+Z6Z5FGx4z1DLIjcvTdl5jSgwsX/DciL35T1Tt92mHXyY8r7lPJ8X/ztooY9aRGTuSZ YnZUnqUW9u4V/38SPDpSNjSIoiMAGSjOuOxKlIZcvDn2J1FQOWva8JtFhu5KWb/Zm79p TCg7gGgR+TcsjDAZ0k2SlSizVfP6wQ3FlRQ6BQVcF7ykKnWbQX5nE6BNTOKGpaLMCXBW 6wHxfLfIlRzgY8nsm6baQ1vV4/rpgcHTsno6i3jxWR1CkI33jZL6ryrpWBZfzPGnak4X fVow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=YAAzd/9adddi/jxpflj8fDwwy6PahhVswdYWxEZgPHY=; b=ftoiGjpAlTUwRTYZ7huejH6STVUuTdat8YhRog+jTuqvnElPIcSgV7eex+0Z5f2s7M vmkv3KANLc+6JrOwsY3oaN0FfUdvwsgl9m3UaNWAnljfKXQjJFIhoEa94VbuuwBDraWR dXiLP0dcaBPX9LiYcijH0p3hn69/x7DP1RgY34QST30xpJ0ovNvPw7krelNFjK3TqUK8 iSNYQKL5KMYysfenFAKVaFh1rfx2Wk+BwJ1Az4zA1rfbjoH1RnOeAv9T7OsIbpeIAvay i7PkdpWSdZq48gnDSRWVqAs7E3Ibq+AyA1GfGeAC5qjmFY7JSrOGfDyS/Nl0J+ttQ8C0 wTkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mYZWFqnt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p5-v6si19841799plk.537.2018.05.24.04.38.12; Thu, 24 May 2018 04:38:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mYZWFqnt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967402AbeEXJtd (ORCPT + 99 others); Thu, 24 May 2018 05:49:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:37926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967384AbeEXJtZ (ORCPT ); Thu, 24 May 2018 05:49:25 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 88F1E20847; Thu, 24 May 2018 09:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527155365; bh=m5D2ZyxRFanIEeWh9u7Xqgs0NDOPgqhI9G0TVqyOL60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mYZWFqntgQ/bRFcXJyNyfcQ9OTz/rnU3Q4pmviviDA7FuLf2pFOfqn+IkmwhimaHC +CUeuOWL0VEixSio1GHSQFxQrbo+cYUmVs+owLSr+c3IVnprYEXpyskZkpIx13LEXu qMf4zUZm1Trcel0Anq+qFyQKXy0RlsusdE2UI3xc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Meelis Roos , Dave Carroll , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.9 58/96] scsi: aacraid: fix shutdown crash when init fails Date: Thu, 24 May 2018 11:38:41 +0200 Message-Id: <20180524093608.811627745@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524093605.602125311@linuxfoundation.org> References: <20180524093605.602125311@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Meelis Roos [ Upstream commit 00c20cdc79259c6c5bf978b21af96c2d3edb646d ] When aacraid init fails with "AAC0: adapter self-test failed.", shutdown leads to UBSAN warning and then oops: [154316.118423] ================================================================================ [154316.118508] UBSAN: Undefined behaviour in drivers/scsi/scsi_lib.c:2328:27 [154316.118566] member access within null pointer of type 'struct Scsi_Host' [154316.118631] CPU: 2 PID: 14530 Comm: reboot Tainted: G W 4.15.0-dirty #89 [154316.118701] Hardware name: Hewlett Packard HP NetServer/HP System Board, BIOS 4.06.46 PW 06/25/2003 [154316.118774] Call Trace: [154316.118848] dump_stack+0x48/0x65 [154316.118916] ubsan_epilogue+0xe/0x40 [154316.118976] __ubsan_handle_type_mismatch+0xfb/0x180 [154316.119043] scsi_block_requests+0x20/0x30 [154316.119135] aac_shutdown+0x18/0x40 [aacraid] [154316.119196] pci_device_shutdown+0x33/0x50 [154316.119269] device_shutdown+0x18a/0x390 [...] [154316.123435] BUG: unable to handle kernel NULL pointer dereference at 000000f4 [154316.123515] IP: scsi_block_requests+0xa/0x30 This is because aac_shutdown() does struct Scsi_Host *shost = pci_get_drvdata(dev); scsi_block_requests(shost); and that assumes shost has been assigned with pci_set_drvdata(). However, pci_set_drvdata(pdev, shost) is done in aac_probe_one() far after bailing out with error from calling the init function ((*aac_drivers[index].init)(aac)), and when the init function fails, no error is returned from aac_probe_one() so PCI layer assumes there is driver attached, and tries to shut it down later. Fix it by returning error from aac_probe_one() when card-specific init function fails. This fixes reboot on my HP NetRAID-4M with dead battery. Signed-off-by: Meelis Roos Reviewed-by: Dave Carroll Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/aacraid/linit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -1203,8 +1203,10 @@ static int aac_probe_one(struct pci_dev * Map in the registers from the adapter. */ aac->base_size = AAC_MIN_FOOTPRINT_SIZE; - if ((*aac_drivers[index].init)(aac)) + if ((*aac_drivers[index].init)(aac)) { + error = -ENODEV; goto out_unmap; + } if (aac->sync_mode) { if (aac_sync_mode)