[PATCH v2] cxl: Fix error path on bad ioctl

Andrew Donnellan andrew.donnellan at au1.ibm.com
Thu Jun 8 15:56:06 AEST 2017


Reviewed-by: Andrew Donnellan <andrew.donnellan at au1.ibm.com>

On 06/06/17 19:43, Frederic Barrat wrote:
> 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).
>
> Signed-off-by: Frederic Barrat <fbarrat at linux.vnet.ibm.com>
> Cc: stable at vger.kernel.org
> Fixes: 0712dc7e73e5 ("cxl: Fix issues when unmapping contexts")
> ---
> Changelog:
> v2: change sizeof() parameter (Vaibhav)
>     tweak commit message and add 'Fixes:' (mpe)
>
>  drivers/misc/cxl/file.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/misc/cxl/file.c b/drivers/misc/cxl/file.c
> index 17b433f1ce23..0761271d68c5 100644
> --- a/drivers/misc/cxl/file.c
> +++ b/drivers/misc/cxl/file.c
> @@ -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) {
>

-- 
Andrew Donnellan              OzLabs, ADL Canberra
andrew.donnellan at au1.ibm.com  IBM Australia Limited



More information about the Linuxppc-dev mailing list