microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

be2iscsi: add checks for dma mapping errors 

hwi_write_buffer() does not check if mapping dma memory succeed. The
patch adds the check and failure handling.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Reviewed-by: Jitendra Bhivare <jitendra.bhivare@avagotech.com>
Acked-by: Jitendra Bhivare <jitendra.bhivare@avagotech.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Alexey Khoroshilov 2016-01-16 00:45:34 +03:00 коммит произвёл Martin K. Petersen
Родитель 1db1194f1f
Коммит e0493627c3
1 изменённых файлов: 14 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
drivers/scsi/be2iscsi/be_main.c
Просмотреть файл

@ -2509,7 +2509,7 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg,
* @pwrb: ptr to the WRB entry * @pwrb: ptr to the WRB entry
* @task: iscsi task which is to be executed * @task: iscsi task which is to be executed
**/ **/
static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task) static int hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task)
{ {
struct iscsi_sge *psgl; struct iscsi_sge *psgl;
struct beiscsi_io_task *io_task = task->dd_data; struct beiscsi_io_task *io_task = task->dd_data;
@ -2541,6 +2541,9 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task)
task->data, task->data,
task->data_count, task->data_count,
PCI_DMA_TODEVICE); PCI_DMA_TODEVICE);
if (pci_dma_mapping_error(phba->pcidev,
io_task->mtask_addr))
return -ENOMEM;
io_task->mtask_data_count = task->data_count; io_task->mtask_data_count = task->data_count;
} else } else
io_task->mtask_addr = 0; io_task->mtask_addr = 0;
@ -2585,6 +2588,7 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task)
AMAP_SET_BITS(struct amap_iscsi_sge, len, psgl, 0x106); AMAP_SET_BITS(struct amap_iscsi_sge, len, psgl, 0x106);
} }
AMAP_SET_BITS(struct amap_iscsi_sge, last_sge, psgl, 1); AMAP_SET_BITS(struct amap_iscsi_sge, last_sge, psgl, 1);
return 0;
} }
/** /**
@ -5046,6 +5050,7 @@ static int beiscsi_mtask(struct iscsi_task *task)
unsigned int doorbell = 0; unsigned int doorbell = 0;
unsigned int cid; unsigned int cid;
unsigned int pwrb_typeoffset = 0; unsigned int pwrb_typeoffset = 0;
int ret = 0;
cid = beiscsi_conn->beiscsi_conn_cid; cid = beiscsi_conn->beiscsi_conn_cid;
pwrb = io_task->pwrb_handle->pwrb; pwrb = io_task->pwrb_handle->pwrb;
@ -5094,7 +5099,7 @@ static int beiscsi_mtask(struct iscsi_task *task)
case ISCSI_OP_LOGIN: case ISCSI_OP_LOGIN:
AMAP_SET_BITS(struct amap_iscsi_wrb, cmdsn_itt, pwrb, 1); AMAP_SET_BITS(struct amap_iscsi_wrb, cmdsn_itt, pwrb, 1);
ADAPTER_SET_WRB_TYPE(pwrb, TGT_DM_CMD, pwrb_typeoffset); ADAPTER_SET_WRB_TYPE(pwrb, TGT_DM_CMD, pwrb_typeoffset);
hwi_write_buffer(pwrb, task); ret = hwi_write_buffer(pwrb, task);
break; break;
case ISCSI_OP_NOOP_OUT: case ISCSI_OP_NOOP_OUT:
if (task->hdr->ttt != ISCSI_RESERVED_TAG) { if (task->hdr->ttt != ISCSI_RESERVED_TAG) {
@ -5114,19 +5119,19 @@ static int beiscsi_mtask(struct iscsi_task *task)
AMAP_SET_BITS(struct amap_iscsi_wrb_v2, AMAP_SET_BITS(struct amap_iscsi_wrb_v2,
dmsg, pwrb, 0); dmsg, pwrb, 0);
} }
hwi_write_buffer(pwrb, task); ret = hwi_write_buffer(pwrb, task);
break; break;
case ISCSI_OP_TEXT: case ISCSI_OP_TEXT:
ADAPTER_SET_WRB_TYPE(pwrb, TGT_DM_CMD, pwrb_typeoffset); ADAPTER_SET_WRB_TYPE(pwrb, TGT_DM_CMD, pwrb_typeoffset);
hwi_write_buffer(pwrb, task); ret = hwi_write_buffer(pwrb, task);
break; break;
case ISCSI_OP_SCSI_TMFUNC: case ISCSI_OP_SCSI_TMFUNC:
ADAPTER_SET_WRB_TYPE(pwrb, INI_TMF_CMD, pwrb_typeoffset); ADAPTER_SET_WRB_TYPE(pwrb, INI_TMF_CMD, pwrb_typeoffset);
hwi_write_buffer(pwrb, task); ret = hwi_write_buffer(pwrb, task);
break; break;
case ISCSI_OP_LOGOUT: case ISCSI_OP_LOGOUT:
ADAPTER_SET_WRB_TYPE(pwrb, HWH_TYPE_LOGOUT, pwrb_typeoffset); ADAPTER_SET_WRB_TYPE(pwrb, HWH_TYPE_LOGOUT, pwrb_typeoffset);
hwi_write_buffer(pwrb, task); ret = hwi_write_buffer(pwrb, task);
break; break;
default: default:
@ -5137,6 +5142,9 @@ static int beiscsi_mtask(struct iscsi_task *task)
return -EINVAL; return -EINVAL;
} }
if (ret)
return ret;
/* Set the task type */ /* Set the task type */
io_task->wrb_type = (is_chip_be2_be3r(phba)) ? io_task->wrb_type = (is_chip_be2_be3r(phba)) ?
AMAP_GET_BITS(struct amap_iscsi_wrb, type, pwrb) : AMAP_GET_BITS(struct amap_iscsi_wrb, type, pwrb) :