Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp4013937imm; Mon, 17 Sep 2018 06:56:54 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZTaVUvm24Q3J7II8Slb3JzDjz5xPRZvBHopyhn75Vz8qnC9A9iWTZW2jfVCEcDyQBUONCt X-Received: by 2002:a62:c4da:: with SMTP id h87-v6mr26206400pfk.39.1537192614825; Mon, 17 Sep 2018 06:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537192614; cv=none; d=google.com; s=arc-20160816; b=aA+ADeRl+UJUQ28nz7uoKmY205MS5aFcCmSeAsi9o7TsbhjygrUm27p2Usq50zzCoM RLsoUYeyBb6IEW86x4mNQ+oXBo0Y5sppE7j560v+7xrYTRvWdLvae7CgYx7RSUaW0XKq t2V/i8aIlZdWP845D2RqKD5v42h0q7c3Z01C3O62F2nWimwXWrr1B9f5z7sqLI0xRsfK lqJls82kFB+T7453KqpDjhEaZ2SwAN7k24+SQSelgUJjGq2rK0Ch3LEW08iI2LxuC/0f wOgBSBjHmwaM/Wz43PhvDe320pBS/I/GsedCa1d2Yy76vuVX8L6imcYf7AJp/ot85go2 Wevw== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=/5HNTG/Y9eMl+e2mgrCXCWBk9Z/A+mNK/Z7eR/CQetc=; b=TbDqQEhBtJXFFM68K4SGT0NoyPKHcVmXpxiDkCFTU1hXaMPrsOLt0Vg5uTEVHrH+aX nSxIWgmlS2h6dUMz5nw/qh/pm7t6IUC0VF/tErwmNYVUGcoPv1KEUHETh/fkQbzsQMph zVOTf0Gp3k2vAAgYgHJyQftNHDgXaMxsHmUBdafp9M5rWbZ11gmFwG60k2N6abQ1wJtX YyAg25qcMp35PWRGSymeosT/8kY/gsgczxeRgL4BJryylo7qiKykHr3WZJwBbsp7OP7d sRnccpGpVTGBVHI0qZTwmt7YxfROCoR4PFMI6Ovc4JtTXdHRAvwHrrPr1p4AkmE0lkKS ppng== 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 j8-v6si14654035plk.196.2018.09.17.06.56.39; Mon, 17 Sep 2018 06:56:54 -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 S1728615AbeIQTWO (ORCPT + 99 others); Mon, 17 Sep 2018 15:22:14 -0400 Received: from mx2.suse.de ([195.135.220.15]:52998 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726865AbeIQTWN (ORCPT ); Mon, 17 Sep 2018 15:22:13 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6D0E2AC9C; Mon, 17 Sep 2018 13:54:45 +0000 (UTC) Subject: Re: [PATCH 2/5] scsi: libsas: check the lldd callback correctly To: Jason Yan , martin.petersen@oracle.com, jejb@linux.vnet.ibm.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, john.garry@huawei.com, zhaohongjiang@huawei.com, dan.j.williams@intel.com, jthumshirn@suse.de, hch@lst.de, huangdaode@hisilicon.com, chenxiang66@hisilicon.com, miaoxie@huawei.com, Ewan Milne , Tomas Henzl References: <20180912082946.34814-1-yanaijie@huawei.com> <20180912082946.34814-3-yanaijie@huawei.com> From: Hannes Reinecke Message-ID: <8114701f-be33-9c41-3ed7-e2a13490569d@suse.com> Date: Mon, 17 Sep 2018 15:54:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180912082946.34814-3-yanaijie@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/12/2018 10:29 AM, Jason Yan wrote: > 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 > --- > 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; > Reviewed-by: Hannes Reinecke Cheers, Hannes