From 9f339cd2f10a5687bbcc1533a21c5e7972296e2e Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 24 Sep 2010 12:46:17 +0000 Subject: [PATCH] Merge of trunk r2234: Fix possible crash if expected values not set git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2235 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index d16de7bed..f34e6ab89 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -2124,7 +2124,10 @@ void scst_adjust_resp_data_len(struct scst_cmd *cmd) { TRACE_ENTRY(); - EXTRACHECKS_BUG_ON(!cmd->expected_values_set); + if (!cmd->expected_values_set) { + cmd->adjusted_resp_data_len = cmd->resp_data_len; + goto out; + } cmd->adjusted_resp_data_len = min(cmd->resp_data_len, cmd->expected_transfer_len); @@ -2138,6 +2141,7 @@ void scst_adjust_resp_data_len(struct scst_cmd *cmd) cmd->adjusted_resp_data_len); } +out: TRACE_EXIT(); return; }