Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp228575imm; Tue, 18 Sep 2018 20:35:51 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaZb6NNr7ihrRI+YMF2L5BvMs1Px+Kj+6IOI68z1Bn/U1n7RtFYBzC6yNZ82MxShc5xb4PT X-Received: by 2002:a63:8e4a:: with SMTP id k71-v6mr30430310pge.45.1537328151580; Tue, 18 Sep 2018 20:35:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537328151; cv=none; d=google.com; s=arc-20160816; b=pmg8GLQOmov1yfxqqn78OgMwrOoAvwNgZ6bbmMXbFdYmNILyV/Hrh8vKONrctnq4rh T2Rl4EwBz2LITsN0FXTbdGGz3+mthOl7sZ1u/CEtJq3kR1k8WuMwnYT5TP9eQay2D48d kj0+om4099MHsr/2JE94F6EXz6KwpUzjil72Zvv8AD9BoMFKMFVPN08korzurYkmobfA a5LtaPXxkleB5HSWgaVMFr3DD/5rH+os36LKxp0wNd7jkWViOuZbFy0JRf8hOs66njEt 4HkDB1KrvK/sE76Ugrj1pPH5ArzAKLtBwNF9nBV9m+Z41rB01RSUyVuuSMdxBG52YwQr JUTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=PSXKNF7OJxrDW799AjPmEbCOZWwMsj7BsqeCX7B2g1E=; b=VyW2eok+84knUkVlfesEv5qiZRlL0viznCNEtJa3rlM4HQsyAqBUYy1g6Ab0vfRVqu KSnU/VMOF33/rB2CyzrE3jYWYYVLBUlvkIjx7EU3RoD3yyGD15RFR9TASa5IfT8AP8Xh 54JM8WDo1zwP8oxCApwNOcoqnZ9M+NFfS+e6Hxa0uoDsuUtc5Tw1BiZL6R4aHYF37Nx5 eVphONWecvYohj3C5cnmVD9136waBCczPdoOhVvPEu8g7VI9W2twvidYl6pPduEvd4Og To5NTZG9lT44eQeJgq2raZcHJmqQRzKr029tOMorPWkVmMS4GiEKP5J4kSFcnNvO45DX Hxug== ARC-Authentication-Results: i=1; mx.google.com; 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 l6-v6si20514933pfc.298.2018.09.18.20.35.35; Tue, 18 Sep 2018 20:35:51 -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; 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 S1727728AbeISJIs (ORCPT + 99 others); Wed, 19 Sep 2018 05:08:48 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:55040 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725973AbeISJIs (ORCPT ); Wed, 19 Sep 2018 05:08:48 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 47FF6FA10A29; Wed, 19 Sep 2018 11:32:55 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.399.0; Wed, 19 Sep 2018 11:32:48 +0800 From: Jason Yan To: , CC: , , , , , , , , , , , Jason Yan , Ewan Milne , Tomas Henzl Subject: [PATCH v2 2/5] scsi: libsas: check the lldd callback correctly Date: Wed, 19 Sep 2018 11:32:01 +0800 Message-ID: <20180919033204.11102-3-yanaijie@huawei.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180919033204.11102-1-yanaijie@huawei.com> References: <20180919033204.11102-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We are using lldd_port_deformed so we'd better check if lldd_port_deformed is NULL. After this, we can remove hisi_sas_port_deformed() because it is just a stub to avoid a NULL dereference caused by the wrong check. Signed-off-by: Jason Yan CC: John Garry CC: Johannes Thumshirn CC: Ewan Milne CC: Christoph Hellwig CC: Tomas Henzl CC: Dan Williams CC: Hannes Reinecke Acked-by: John Garry Reviewed-by: Hannes Reinecke --- drivers/scsi/hisi_sas/hisi_sas_main.c | 9 ++------- drivers/scsi/libsas/sas_discover.c | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index a4e2e6aa9a6b..1975c9266978 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1861,10 +1861,6 @@ static void hisi_sas_port_formed(struct asd_sas_phy *sas_phy) hisi_sas_port_notify_formed(sas_phy); } -static void hisi_sas_port_deformed(struct asd_sas_phy *sas_phy) -{ -} - static int hisi_sas_write_gpio(struct sas_ha_struct *sha, u8 reg_type, u8 reg_index, u8 reg_count, u8 *write_data) { @@ -1954,10 +1950,9 @@ static struct sas_domain_function_template hisi_sas_transport_ops = { .lldd_I_T_nexus_reset = hisi_sas_I_T_nexus_reset, .lldd_lu_reset = hisi_sas_lu_reset, .lldd_query_task = hisi_sas_query_task, - .lldd_clear_nexus_ha = hisi_sas_clear_nexus_ha, + .lldd_clear_nexus_ha = hisi_sas_clear_nexus_ha, .lldd_port_formed = hisi_sas_port_formed, - .lldd_port_deformed = hisi_sas_port_deformed, - .lldd_write_gpio = hisi_sas_write_gpio, + .lldd_write_gpio = hisi_sas_write_gpio, }; void hisi_sas_init_mem(struct hisi_hba *hisi_hba) diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c index 0148ae62a52a..dde433aa59c2 100644 --- a/drivers/scsi/libsas/sas_discover.c +++ b/drivers/scsi/libsas/sas_discover.c @@ -260,7 +260,7 @@ static void sas_suspend_devices(struct work_struct *work) * phy_list is not being mutated */ list_for_each_entry(phy, &port->phy_list, port_phy_el) { - if (si->dft->lldd_port_formed) + if (si->dft->lldd_port_deformed) si->dft->lldd_port_deformed(phy); phy->suspended = 1; port->suspended = 1; -- 2.14.4