diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-02-02 23:04:06 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-02-02 23:04:06 +0000 |
| commit | a3a6c48d66845c2cda8e46367922d09379b87813 (patch) | |
| tree | 5f7beacfa39df6e8a25566097996e15549905e2c /sys | |
| parent | dc935c4f19cc0bc5c0adf3b7e66d015979a17106 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/nvme/nvme_ctrlr.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 11ab016ba252..fd836f991090 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -874,8 +874,20 @@ nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, struct mtx *mtx; struct buf *buf = NULL; int ret = 0; + vm_offset_t addr, end; if (pt->len > 0) { + /* + * vmapbuf calls vm_fault_quick_hold_pages which only maps full + * pages. Ensure this request has fewer than MAXPHYS bytes when + * extended to full pages. + */ + addr = (vm_offset_t)pt->buf; + end = round_page(addr + pt->len); + addr = trunc_page(addr); + if (end - addr > MAXPHYS) + return EIO; + if (pt->len > ctrlr->max_xfer_size) { nvme_printf(ctrlr, "pt->len (%d) " "exceeds max_xfer_size (%d)\n", pt->len, |