diff options
Diffstat (limited to 'drivers/md/dm-log-userspace-transfer.c')
| -rw-r--r-- | drivers/md/dm-log-userspace-transfer.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c index 54abf9e303b7..f1c8cae70b4b 100644 --- a/drivers/md/dm-log-userspace-transfer.c +++ b/drivers/md/dm-log-userspace-transfer.c | |||
| @@ -172,11 +172,15 @@ int dm_consult_userspace(const char *uuid, uint64_t luid, int request_type, | |||
| 172 | { | 172 | { |
| 173 | int r = 0; | 173 | int r = 0; |
| 174 | size_t dummy = 0; | 174 | size_t dummy = 0; |
| 175 | int overhead_size = | 175 | int overhead_size = sizeof(struct dm_ulog_request) + sizeof(struct cn_msg); |
| 176 | sizeof(struct dm_ulog_request *) + sizeof(struct cn_msg); | ||
| 177 | struct dm_ulog_request *tfr = prealloced_ulog_tfr; | 176 | struct dm_ulog_request *tfr = prealloced_ulog_tfr; |
| 178 | struct receiving_pkg pkg; | 177 | struct receiving_pkg pkg; |
| 179 | 178 | ||
| 179 | /* | ||
| 180 | * Given the space needed to hold the 'struct cn_msg' and | ||
| 181 | * 'struct dm_ulog_request' - do we have enough payload | ||
| 182 | * space remaining? | ||
| 183 | */ | ||
| 180 | if (data_size > (DM_ULOG_PREALLOCED_SIZE - overhead_size)) { | 184 | if (data_size > (DM_ULOG_PREALLOCED_SIZE - overhead_size)) { |
| 181 | DMINFO("Size of tfr exceeds preallocated size"); | 185 | DMINFO("Size of tfr exceeds preallocated size"); |
| 182 | return -EINVAL; | 186 | return -EINVAL; |
| @@ -191,7 +195,7 @@ resend: | |||
| 191 | */ | 195 | */ |
| 192 | mutex_lock(&dm_ulog_lock); | 196 | mutex_lock(&dm_ulog_lock); |
| 193 | 197 | ||
| 194 | memset(tfr, 0, DM_ULOG_PREALLOCED_SIZE - overhead_size); | 198 | memset(tfr, 0, DM_ULOG_PREALLOCED_SIZE - sizeof(struct cn_msg)); |
| 195 | memcpy(tfr->uuid, uuid, DM_UUID_LEN); | 199 | memcpy(tfr->uuid, uuid, DM_UUID_LEN); |
| 196 | tfr->luid = luid; | 200 | tfr->luid = luid; |
| 197 | tfr->seq = dm_ulog_seq++; | 201 | tfr->seq = dm_ulog_seq++; |
