summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Svec <martin.svec@zoner.cz>2014-04-01 16:03:02 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-06 07:59:29 -0700
commit1a7bfeb1107d5fd3e537ab38227688be685e2ce8 (patch)
treec516cd489fac214c4078b2f9f3aee6e80c2d83cf
parentd57b778d6769de07e6ba703ff3f2d0f07f01c94a (diff)
downloadkernel-common-1a7bfeb1107d5fd3e537ab38227688be685e2ce8.tar.gz
kernel-common-1a7bfeb1107d5fd3e537ab38227688be685e2ce8.tar.bz2
kernel-common-1a7bfeb1107d5fd3e537ab38227688be685e2ce8.zip
Target/sbc: Initialize COMPARE_AND_WRITE write_sg scatterlist
commit a1e1774c6dfa3a524dd8df51ca95185fe5ef3247 upstream. When compiled with CONFIG_DEBUG_SG set, uninitialized SGL leads to BUG() in compare_and_write_callback(). Signed-off-by: Martin Svec <martin.svec@zoner.cz> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/target/target_core_sbc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index 77e6531fb0a1..aa064a7bb446 100644
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -425,13 +425,14 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd)
goto out;
}
- write_sg = kzalloc(sizeof(struct scatterlist) * cmd->t_data_nents,
+ write_sg = kmalloc(sizeof(struct scatterlist) * cmd->t_data_nents,
GFP_KERNEL);
if (!write_sg) {
pr_err("Unable to allocate compare_and_write sg\n");
ret = TCM_OUT_OF_RESOURCES;
goto out;
}
+ sg_init_table(write_sg, cmd->t_data_nents);
/*
* Setup verify and write data payloads from total NumberLBAs.
*/