From 726f9eba8817506e818ae177b060ff35f8f26443 Mon Sep 17 00:00:00 2001 From: "Salyzyn, Mark" Date: Wed, 21 Mar 2007 13:22:56 -0400 Subject: [PATCH] --- yaml --- r: 53661 b: refs/heads/master c: 20235f35221472f1a127a5d5414f11091eb0a845 h: refs/heads/master i: 53659: 1b65477609f0e3a67c01225a5c5394b89f30a29d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aacraid/aachba.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index be3d57f6dc75..c42a708d1578 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0272bf7271eb6895b081c3df34c3ebe50cb769b7 +refs/heads/master: 20235f35221472f1a127a5d5414f11091eb0a845 diff --git a/trunk/drivers/scsi/aacraid/aachba.c b/trunk/drivers/scsi/aacraid/aachba.c index 0c4e27eb6520..f9deab686dc4 100644 --- a/trunk/drivers/scsi/aacraid/aachba.c +++ b/trunk/drivers/scsi/aacraid/aachba.c @@ -350,8 +350,9 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigne buf = scsicmd->request_buffer; transfer_len = min(scsicmd->request_bufflen, len + offset); } - - memcpy(buf + offset, data, transfer_len - offset); + transfer_len -= offset; + if (buf && transfer_len) + memcpy(buf + offset, data, transfer_len); if (scsicmd->use_sg) kunmap_atomic(buf - sg->offset, KM_IRQ0);