98 lines
3.1 KiB
Diff
98 lines
3.1 KiB
Diff
From 22834ed6cec2690817120e960d43bbf76ddfda17 Mon Sep 17 00:00:00 2001
|
|
From: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Date: Fri, 9 Nov 2018 22:06:35 +0800
|
|
Subject: [PATCH 13/31] scsi: hisi_sas: Relocate some codes to avoid an unused
|
|
check
|
|
Origin: https://git.kernel.org/linus/745b6847634c11dda1079d0290781a443eddb4b7
|
|
|
|
In function hisi_sas_task_prep(), we check asd_sas_port, but in function
|
|
hisi_sas_task_exec(), we already refer to asd_sas_port by using function
|
|
dev_to_hisi_hba() implicitly. So to avoid this possible invalid
|
|
dereference, relocate the check to function hisi_sas_task_prep().
|
|
|
|
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 44 ++++++++++++++-------------
|
|
1 file changed, 23 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index dc71f8d83551..15360d797760 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -303,36 +303,19 @@ static int hisi_sas_task_prep(struct sas_task *task,
|
|
int *pass)
|
|
{
|
|
struct domain_device *device = task->dev;
|
|
- struct hisi_hba *hisi_hba;
|
|
+ struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
|
|
struct hisi_sas_device *sas_dev = device->lldd_dev;
|
|
struct hisi_sas_port *port;
|
|
struct hisi_sas_slot *slot;
|
|
struct hisi_sas_cmd_hdr *cmd_hdr_base;
|
|
struct asd_sas_port *sas_port = device->port;
|
|
- struct device *dev;
|
|
+ struct device *dev = hisi_hba->dev;
|
|
int dlvry_queue_slot, dlvry_queue, rc, slot_idx;
|
|
int n_elem = 0, n_elem_req = 0, n_elem_resp = 0;
|
|
struct hisi_sas_dq *dq;
|
|
unsigned long flags;
|
|
int wr_q_index;
|
|
|
|
- if (!sas_port) {
|
|
- struct task_status_struct *ts = &task->task_status;
|
|
-
|
|
- ts->resp = SAS_TASK_UNDELIVERED;
|
|
- ts->stat = SAS_PHY_DOWN;
|
|
- /*
|
|
- * libsas will use dev->port, should
|
|
- * not call task_done for sata
|
|
- */
|
|
- if (device->dev_type != SAS_SATA_DEV)
|
|
- task->task_done(task);
|
|
- return -ECOMM;
|
|
- }
|
|
-
|
|
- hisi_hba = dev_to_hisi_hba(device);
|
|
- dev = hisi_hba->dev;
|
|
-
|
|
if (DEV_IS_GONE(sas_dev)) {
|
|
if (sas_dev)
|
|
dev_info(dev, "task prep: device %d not ready\n",
|
|
@@ -507,10 +490,29 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags,
|
|
u32 rc;
|
|
u32 pass = 0;
|
|
unsigned long flags;
|
|
- struct hisi_hba *hisi_hba = dev_to_hisi_hba(task->dev);
|
|
- struct device *dev = hisi_hba->dev;
|
|
+ struct hisi_hba *hisi_hba;
|
|
+ struct device *dev;
|
|
+ struct domain_device *device = task->dev;
|
|
+ struct asd_sas_port *sas_port = device->port;
|
|
struct hisi_sas_dq *dq = NULL;
|
|
|
|
+ if (!sas_port) {
|
|
+ struct task_status_struct *ts = &task->task_status;
|
|
+
|
|
+ ts->resp = SAS_TASK_UNDELIVERED;
|
|
+ ts->stat = SAS_PHY_DOWN;
|
|
+ /*
|
|
+ * libsas will use dev->port, should
|
|
+ * not call task_done for sata
|
|
+ */
|
|
+ if (device->dev_type != SAS_SATA_DEV)
|
|
+ task->task_done(task);
|
|
+ return -ECOMM;
|
|
+ }
|
|
+
|
|
+ hisi_hba = dev_to_hisi_hba(device);
|
|
+ dev = hisi_hba->dev;
|
|
+
|
|
if (unlikely(test_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags))) {
|
|
if (in_softirq())
|
|
return -EINVAL;
|
|
--
|
|
2.20.1
|
|
|