Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp931245ybt; Wed, 17 Jun 2020 18:13:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQg5oNFwMZBBBlzr5v4CP+BQUiGwFmreIeHB5uM8bgVFRYODDWKOEZ1dOwIvHA0Hh3v/Jt X-Received: by 2002:aa7:c496:: with SMTP id m22mr1804125edq.187.1592442833346; Wed, 17 Jun 2020 18:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442833; cv=none; d=google.com; s=arc-20160816; b=dozTZxazP2qJzm6HCtoAimffrrrFYw/jVUhDxrAHxAwPEJnQdqItE4dpS4Qsm4I2bJ Gfp8OBGoBm/u5u9mkfZYljuaOoac/H9z7yB04jeyPIoRo/wyf1jlA8L++JjLxi5sF8v+ UBHrjpQW1bCWrNzAGpSoG1LSGdxIvqWlgctV1/HPzco+EwuGyRkl4oLHnxAoYt+z0aZp kCJm4tZp/VsjCKAEAdGIw/ceBAquy4Rs6cGnxjm2jS0glE/WZJ9WDoyTyMd1oS4Q8WI0 mibWnQpw/TqaWSYFo1dQqGz6afZMqUj8B+C/g3SR9FfJKktZhHGvGNnYyFbUMsrfref7 RX2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LLoJesUc2wB0WsjXbyVF81nwF35RgP1ZSI1GLcihwyU=; b=A9T9InRkPKf6BOfn8JIBYmRkbkdDH+ctsYlP+h/Pls9qNKEs5e/t0OhWKO2pdZJ/OO I/ur0Sq9rFN60QIljYzOf0doVvpvybWtK+h6wBqoI4Sk8OYfHnr/oC2pXd6RcehqvF03 gcNFykWdhq/W2PPHadi6iwv2JiPUOCYgWFagBuoIYIlesHHYh0qeIIB6ZePeXywrwEJX J+jblmS8mNNV/C/5ktVF8RXQStTp5wloUAI0+AcyBQLlFGM4qylS10crejBFgVlEpxHy vtl+psUHRHbpj+siKmo2tjZgDrN2xU1CuigDFhQ6N4sAkp5kQpX4FirGMqK+Z5NyPTnM /YMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HByx1gmK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ly15si875818ejb.649.2020.06.17.18.13.31; Wed, 17 Jun 2020 18:13:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HByx1gmK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728676AbgFRBK4 (ORCPT + 99 others); Wed, 17 Jun 2020 21:10:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:38494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727809AbgFRBKz (ORCPT ); Wed, 17 Jun 2020 21:10:55 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 70F9820FC3; Thu, 18 Jun 2020 01:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442654; bh=Wcx8lk0N3Maecz0c16aXSXFtrPDKxIAjS2OEZjvytbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HByx1gmKnUJG8GW2gZZW14xC0guDijZcGJeNdUdIRA8kSynkfDp/8+V6fs8fIHzJN bdYdo7VvxdSA73tuL0wMDv9Frodnb0XgKSbHsL9JAFhHmofNqhgROC6FXipMm5Kp0b jsxSmWEku+jG9jODhS1qmVLtzPjYMosGxKov2bvg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chad Dupuis , Saurav Kashyap , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 126/388] scsi: qedf: Fix crash when MFW calls for protocol stats while function is still probing Date: Wed, 17 Jun 2020 21:03:43 -0400 Message-Id: <20200618010805.600873-126-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chad Dupuis [ Upstream commit ad40f5256095c68dc17c991eb976261d5ea2daaa ] The MFW may make a call to qed and then to qedf for protocol statistics while the function is still probing. If this happens it's possible that some members of the struct qedf_ctx may not be fully initialized which can result in a NULL pointer dereference or general protection fault. To prevent this, add a new flag call QEDF_PROBING and set it when the __qedf_probe() function is active. Then in the qedf_get_protocol_tlv_data() function we can check if the function is still probing and return immediantely before any uninitialized structures can be touched. Link: https://lore.kernel.org/r/20200416084314.18851-9-skashyap@marvell.com Signed-off-by: Chad Dupuis Signed-off-by: Saurav Kashyap Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qedf/qedf.h | 1 + drivers/scsi/qedf/qedf_main.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qedf/qedf.h b/drivers/scsi/qedf/qedf.h index f3f399fe10c8..0da4e16fb23a 100644 --- a/drivers/scsi/qedf/qedf.h +++ b/drivers/scsi/qedf/qedf.h @@ -355,6 +355,7 @@ struct qedf_ctx { #define QEDF_GRCDUMP_CAPTURE 4 #define QEDF_IN_RECOVERY 5 #define QEDF_DBG_STOP_IO 6 +#define QEDF_PROBING 8 unsigned long flags; /* Miscellaneous state flags */ int fipvlan_retries; u8 num_queues; diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index 5b19f5175c5c..3a7d03472922 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c @@ -3153,7 +3153,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) { int rc = -EINVAL; struct fc_lport *lport; - struct qedf_ctx *qedf; + struct qedf_ctx *qedf = NULL; struct Scsi_Host *host; bool is_vf = false; struct qed_ll2_params params; @@ -3183,6 +3183,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) /* Initialize qedf_ctx */ qedf = lport_priv(lport); + set_bit(QEDF_PROBING, &qedf->flags); qedf->lport = lport; qedf->ctlr.lp = lport; qedf->pdev = pdev; @@ -3206,9 +3207,12 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) } else { /* Init pointers during recovery */ qedf = pci_get_drvdata(pdev); + set_bit(QEDF_PROBING, &qedf->flags); lport = qedf->lport; } + QEDF_INFO(&qedf->dbg_ctx, QEDF_LOG_DISC, "Probe started.\n"); + host = lport->host; /* Allocate mempool for qedf_io_work structs */ @@ -3513,6 +3517,10 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) else fc_fabric_login(lport); + QEDF_INFO(&qedf->dbg_ctx, QEDF_LOG_DISC, "Probe done.\n"); + + clear_bit(QEDF_PROBING, &qedf->flags); + /* All good */ return 0; @@ -3538,6 +3546,11 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) err1: scsi_host_put(lport->host); err0: + if (qedf) { + QEDF_INFO(&qedf->dbg_ctx, QEDF_LOG_DISC, "Probe done.\n"); + + clear_bit(QEDF_PROBING, &qedf->flags); + } return rc; } @@ -3687,11 +3700,25 @@ void qedf_get_protocol_tlv_data(void *dev, void *data) { struct qedf_ctx *qedf = dev; struct qed_mfw_tlv_fcoe *fcoe = data; - struct fc_lport *lport = qedf->lport; - struct Scsi_Host *host = lport->host; - struct fc_host_attrs *fc_host = shost_to_fc_host(host); + struct fc_lport *lport; + struct Scsi_Host *host; + struct fc_host_attrs *fc_host; struct fc_host_statistics *hst; + if (!qedf) { + QEDF_ERR(NULL, "qedf is null.\n"); + return; + } + + if (test_bit(QEDF_PROBING, &qedf->flags)) { + QEDF_ERR(&qedf->dbg_ctx, "Function is still probing.\n"); + return; + } + + lport = qedf->lport; + host = lport->host; + fc_host = shost_to_fc_host(host); + /* Force a refresh of the fc_host stats including offload stats */ hst = qedf_fc_get_host_stats(host); -- 2.25.1