1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 80ee130f8253..942d094269fb 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -563,8 +563,6 @@ static int scatter_data_area(struct tcmu_dev *udev,
                                         block_remaining);
                         to_offset = get_block_offset_user(udev, dbi,
                                         block_remaining);
-                        offset = DATA_BLOCK_SIZE - block_remaining;
-                        to += offset;
 
                         if (*iov_cnt != 0 &&
                             to_offset == iov_tail(*iov)) {
@@ -575,8 +573,10 @@ static int scatter_data_area(struct tcmu_dev *udev,
                                 (*iov)->iov_len = copy_bytes;
                         }
                         if (copy_data) {
-                                memcpy(to, from + sg->length - sg_remaining,
-                                        copy_bytes);
+                                offset = DATA_BLOCK_SIZE - block_remaining;
+                                memcpy(to + offset,
+                                       from + sg->length - sg_remaining,
+                                       copy_bytes);
                                 tcmu_flush_dcache_range(to, copy_bytes);
                         }
                         sg_remaining -= copy_bytes;
@@ -637,9 +637,8 @@ static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
                         copy_bytes = min_t(size_t, sg_remaining,
                                         block_remaining);
                         offset = DATA_BLOCK_SIZE - block_remaining;
-                        from += offset;
                         tcmu_flush_dcache_range(from, copy_bytes);
-                        memcpy(to + sg->length - sg_remaining, from,
+                        memcpy(to + sg->length - sg_remaining, from + offset,
                                         copy_bytes);
 
                         sg_remaining -= copy_bytes;
@@ -1433,6 +1432,8 @@ static int tcmu_update_uio_info(struct tcmu_dev *udev)
         if (udev->dev_config[0])
                 snprintf(str + used, size - used, "/%s", udev->dev_config);
 
+        /* If the old string exists, free it */
+        kfree(info->name);
         info->name = str;
 
         return 0;