SMB_ASSERT(plock->lock_type != UNLOCK_LOCK);
- for (i=0; i < br_lck->num_locks; i++) {
- if (locks[i].start + locks[i].size < locks[i].start) {
- /* 64-bit wrap. Error. */
- return NT_STATUS_INVALID_LOCK_RANGE;
- }
+ if ((plock->start + plock->size - 1 < plock->start) &&
+ plock->size != 0) {
+ return NT_STATUS_INVALID_LOCK_RANGE;
+ }
+ for (i=0; i < br_lck->num_locks; i++) {
/* Do any Windows or POSIX locks conflict ? */
if (brl_conflict(&locks[i], plock)) {
/* Remember who blocked us. */
}
/* Don't allow 64-bit lock wrap. */
- if (plock->start + plock->size < plock->start ||
- plock->start + plock->size < plock->size) {
+ if (plock->start + plock->size - 1 < plock->start) {
return NT_STATUS_INVALID_PARAMETER;
}
}
for (i=0; i<in_lock_count; i++) {
- uint64_t max_count;
bool invalid = false;
switch (in_locks[i].flags) {
} else {
locks[i].brltype = UNLOCK_LOCK;
}
-
- max_count = UINT64_MAX - locks[i].offset;
- if (locks[i].count > max_count) {
- tevent_req_nterror(req, NT_STATUS_INVALID_LOCK_RANGE);
- return tevent_req_post(req, ev);
- }
}
state->locks = locks;