diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-27 20:30:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-27 20:30:46 +0100 |
| commit | 2002e90412df17ef7f714be62ed96a3c80b2f907 (patch) | |
| tree | 3dd03684f7436320ec64f9c702b5d057a25dca17 /drivers/misc/cxl/context.c | |
| parent | 02a9547e9b3f10d73fde66f52fc8b2a375a300cd (diff) | |
| parent | 3b7ce99748f0d006f9d1aa85709872e7b46787f7 (diff) | |
| download | kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.tar.gz kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.tar.bz2 kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.zip | |
Merge branch 'topic/ics43432' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-gtm601
Diffstat (limited to 'drivers/misc/cxl/context.c')
| -rw-r--r-- | drivers/misc/cxl/context.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c index 2a4c80ac322a..1287148629c0 100644 --- a/drivers/misc/cxl/context.c +++ b/drivers/misc/cxl/context.c @@ -113,11 +113,11 @@ static int cxl_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) if (ctx->afu->current_mode == CXL_MODE_DEDICATED) { area = ctx->afu->psn_phys; - if (offset > ctx->afu->adapter->ps_size) + if (offset >= ctx->afu->adapter->ps_size) return VM_FAULT_SIGBUS; } else { area = ctx->psn_phys; - if (offset > ctx->psn_size) + if (offset >= ctx->psn_size) return VM_FAULT_SIGBUS; } @@ -145,8 +145,16 @@ static const struct vm_operations_struct cxl_mmap_vmops = { */ int cxl_context_iomap(struct cxl_context *ctx, struct vm_area_struct *vma) { + u64 start = vma->vm_pgoff << PAGE_SHIFT; u64 len = vma->vm_end - vma->vm_start; - len = min(len, ctx->psn_size); + + if (ctx->afu->current_mode == CXL_MODE_DEDICATED) { + if (start + len > ctx->afu->adapter->ps_size) + return -EINVAL; + } else { + if (start + len > ctx->psn_size) + return -EINVAL; + } if (ctx->afu->current_mode != CXL_MODE_DEDICATED) { /* make sure there is a valid per process space for this AFU */ |