warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check return value of scsi_malloc in order to

Browse Source 
avoid dereferencing NULL return value.

Signed-off-by: geruijun <geruijun@huawei.com>
This commit is contained in:
geruijun
2022-03-16 01:36:22 +08:00
committed by Bart Van Assche
parent 045c2387e7
commit 8ef5d8243b
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/scsi-lowlevel.c
View File

@@ -2912,9 +2912,15 @@ scsi_modesense_marshall_caching(struct scsi_task *task,
struct scsi_data *data;
data = scsi_malloc(task, sizeof(struct scsi_data));
if (data == NULL) {
return NULL;
}
data->size = 20 + hdr_size;
data->data = scsi_malloc(task, data->size);
if (data->data == NULL) {
return NULL;
}
if (mp->caching.ic) data->data[hdr_size + 2] |= 0x80;
if (mp->caching.abpf) data->data[hdr_size + 2] |= 0x40;
@@ -2953,9 +2959,15 @@ scsi_modesense_marshall_control(struct scsi_task *task,
struct scsi_data *data;
data = scsi_malloc(task, sizeof(struct scsi_data));
if (data == NULL) {
return NULL;
}
data->size = 12 + hdr_size;
data->data = scsi_malloc(task, data->size);
if (data->data == NULL) {
return NULL;
}
data->data[hdr_size + 2] |= (mp->control.tst << 5) & 0xe0;
if (mp->control.tmf_only) data->data[hdr_size + 2] |= 0x10;
@@ -2993,9 +3005,15 @@ scsi_modesense_marshall_power_condition(struct scsi_task *task,
struct scsi_data *data;
data = scsi_malloc(task, sizeof(struct scsi_data));
if (data == NULL) {
return NULL;
}
data->size = 40 + hdr_size;
data->data = scsi_malloc(task, data->size);
if (data->data == NULL) {
return NULL;
}
data->data[hdr_size + 2] |=
(mp->power_condition.pm_bg_precedence << 6) & 0xc0;
@@ -3035,9 +3053,15 @@ scsi_modesense_marshall_disconnect_reconnect(struct scsi_task *task,
struct scsi_data *data;
data = scsi_malloc(task, sizeof(struct scsi_data));
if (data == NULL) {
return NULL;
}
data->size = 16 + hdr_size;
data->data = scsi_malloc(task, data->size);
if (data->data == NULL) {
return NULL;
}
data->data[hdr_size + 2] = mp->disconnect_reconnect.buffer_full_ratio;
data->data[hdr_size + 3] = mp->disconnect_reconnect.buffer_empty_ratio;
@@ -3064,9 +3088,15 @@ scsi_modesense_marshall_informational_exceptions_control(struct scsi_task *task,
struct scsi_data *data;
data = scsi_malloc(task, sizeof(struct scsi_data));
if (data == NULL) {
return NULL;
}
data->size = 12 + hdr_size;
data->data = scsi_malloc(task, data->size);
if (data->data == NULL) {
return NULL;
}
if (mp->iec.perf) data->data[hdr_size + 2] |= 0x80;
if (mp->iec.ebf) data->data[hdr_size + 2] |= 0x20;