aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorMartin Svec <martin.svec@zoner.cz>2014-04-01 10:03:02 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2014-04-07 04:48:53 -0400
commita1e1774c6dfa3a524dd8df51ca95185fe5ef3247 (patch)
treefea7c7f70242f729320c22477f661be830bb0be8 /drivers/target
parent9d2e59f2a778328a41771fe9a0098dadbc4314ba (diff)
Target/sbc: Initialize COMPARE_AND_WRITE write_sg scatterlist
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> Cc: <stable@vger.kernel.org> #3.12+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-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 62daef5c0c8f..ec204f7ef126 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)
425 goto out; 425 goto out;
426 } 426 }
427 427
428 write_sg = kzalloc(sizeof(struct scatterlist) * cmd->t_data_nents, 428 write_sg = kmalloc(sizeof(struct scatterlist) * cmd->t_data_nents,
429 GFP_KERNEL); 429 GFP_KERNEL);
430 if (!write_sg) { 430 if (!write_sg) {
431 pr_err("Unable to allocate compare_and_write sg\n"); 431 pr_err("Unable to allocate compare_and_write sg\n");
432 ret = TCM_OUT_OF_RESOURCES; 432 ret = TCM_OUT_OF_RESOURCES;
433 goto out; 433 goto out;
434 } 434 }
435 sg_init_table(write_sg, cmd->t_data_nents);
435 /* 436 /*
436 * Setup verify and write data payloads from total NumberLBAs. 437 * Setup verify and write data payloads from total NumberLBAs.
437 */ 438 */