d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix three bugs highlighted by review:

Browse Source 
- maxio should be dp->d_maxsize. This is often MAXPHYS, but not always
  (especially if MAXPHYS is > 1MB).
- Unlock the periph before returning. We don't need to relock it to
  release the ccb.
- Make sure we release the ccb in error paths.

Reviewed by: cperciva
This commit is contained in:
Warner Losh 2020-04-30 21:08:59 +00:00
parent 116f7fccc0
commit 2d76f4aad4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/cam/nvme/nvme_da.c
View File

@ -402,7 +402,7 @@ ndaioctl(struct disk *dp, u_long cmd, void *data, int fflag,
struct nvme_pt_command *pt;
union ccb *ccb;
struct cam_periph_map_info mapinfo;
u_int maxmap = MAXPHYS; /* XXX is this right */
u_int maxmap = dp->d_maxsize;
int error;
/*
@ -426,8 +426,10 @@ ndaioctl(struct disk *dp, u_long cmd, void *data, int fflag,
*/
memset(&mapinfo, 0, sizeof(mapinfo));
error = cam_periph_mapmem(ccb, &mapinfo, maxmap);
if (error)
if (error) {
xpt_release_ccb(ccb);
return (error);
}
/*
* Lock the periph and run the command. XXX do we need
@ -442,7 +444,6 @@ ndaioctl(struct disk *dp, u_long cmd, void *data, int fflag,
* Tear down mapping and return status.
*/
cam_periph_unmapmem(ccb, &mapinfo);
cam_periph_lock(periph);
error = (ccb->ccb_h.status == CAM_REQ_CMP) ? 0 : EIO;
xpt_release_ccb(ccb);
return (error);