summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2013-09-18 12:33:42 -0700
committerNicholas Bellinger <nab@linux-iscsi.org>2013-10-01 21:27:21 -0700
commit3e9e01de5ed3fb2810215e2a3b479e7585785ac0 (patch)
treef1bdcc755e7af64b183566a16bdf0ece256a8833 /drivers
parent15c03dd4859ab16f9212238f29dd315654aa94f6 (diff)
downloadlinux-stable-3e9e01de5ed3fb2810215e2a3b479e7585785ac0.tar.gz
linux-stable-3e9e01de5ed3fb2810215e2a3b479e7585785ac0.tar.bz2
linux-stable-3e9e01de5ed3fb2810215e2a3b479e7585785ac0.zip
target: Fix xop->dbl assignment in target_xcopy_parse_segdesc_02
This patch fixes up an incorrect assignment for xop->dbl within target_xcopy_parse_segdesc_02() code, as reported by Coverity here: http://marc.info/?l=linux-kernel&m=137936416618490&w=2 Reported-by: Dave Jones <davej@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/target/target_core_xcopy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index 4d22e7d2adca..3da4fd10b9f8 100644
--- a/drivers/target/target_core_xcopy.c
+++ b/drivers/target/target_core_xcopy.c
@@ -298,8 +298,8 @@ static int target_xcopy_parse_segdesc_02(struct se_cmd *se_cmd, struct xcopy_op
(unsigned long long)xop->dst_lba);
if (dc != 0) {
- xop->dbl = (desc[29] << 16) & 0xff;
- xop->dbl |= (desc[30] << 8) & 0xff;
+ xop->dbl = (desc[29] & 0xff) << 16;
+ xop->dbl |= (desc[30] & 0xff) << 8;
xop->dbl |= desc[31] & 0xff;
pr_debug("XCOPY seg desc 0x02: DC=1 w/ dbl: %u\n", xop->dbl);