Skip to content

Commit

Permalink
cxl: Fix error path on bad ioctl
Browse files Browse the repository at this point in the history
Fix error path if we can't copy user structure on CXL_IOCTL_START_WORK
ioctl. We shouldn't unlock the context status mutex as it was not
locked (yet).

Fixes: 0712dc7 ("cxl: Fix issues when unmapping contexts")
Cc: stable@vger.kernel.org # v3.19+
Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
Reviewed-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Frederic Barrat authored and Michael Ellerman committed Jun 8, 2017
1 parent 8c21857 commit cec422c
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/misc/cxl/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,8 @@ static long afu_ioctl_start_work(struct cxl_context *ctx,

/* Do this outside the status_mutex to avoid a circular dependency with
* the locking in cxl_mmap_fault() */
if (copy_from_user(&work, uwork,
sizeof(struct cxl_ioctl_start_work))) {
rc = -EFAULT;
goto out;
}
if (copy_from_user(&work, uwork, sizeof(work)))
return -EFAULT;

mutex_lock(&ctx->status_mutex);
if (ctx->status != OPENED) {
Expand Down

0 comments on commit cec422c

Please sign in to comment.