* Re: [PATCH v2] cxl: Fix error path on bad ioctl
2017-06-06 9:43 [PATCH v2] cxl: Fix error path on bad ioctl Frederic Barrat
@ 2017-06-08 5:43 ` Vaibhav Jain
2017-06-08 5:56 ` Andrew Donnellan
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Vaibhav Jain @ 2017-06-08 5:43 UTC (permalink / raw)
To: Frederic Barrat, linuxppc-dev, mpe, andrew.donnellan, clombard,
philippe.bergheaud
Hi Fred,
Thanks for addressing the review comments.
Frederic Barrat <fbarrat@linux.vnet.ibm.com> writes:
> 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@linux.vnet.ibm.com>
> Cc: stable@vger.kernel.org
> Fixes: 0712dc7e73e5 ("cxl: Fix issues when unmapping contexts")
> ---
> Changelog:
> v2: change sizeof() parameter (Vaibhav)
> tweak commit message and add 'Fixes:' (mpe)
Reviewed-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] cxl: Fix error path on bad ioctl
2017-06-06 9:43 [PATCH v2] cxl: Fix error path on bad ioctl Frederic Barrat
2017-06-08 5:43 ` Vaibhav Jain
@ 2017-06-08 5:56 ` Andrew Donnellan
2017-06-08 22:34 ` [v2] " Michael Ellerman
2017-06-09 6:57 ` [PATCH v2] " christophe lombard
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Donnellan @ 2017-06-08 5:56 UTC (permalink / raw)
To: Frederic Barrat, linuxppc-dev, mpe, vaibhav, clombard,
philippe.bergheaud
Reviewed-by: Andrew Donnellan <andrew.donnellan@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@linux.vnet.ibm.com>
> Cc: stable@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@au1.ibm.com IBM Australia Limited
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [v2] cxl: Fix error path on bad ioctl
2017-06-06 9:43 [PATCH v2] cxl: Fix error path on bad ioctl Frederic Barrat
2017-06-08 5:43 ` Vaibhav Jain
2017-06-08 5:56 ` Andrew Donnellan
@ 2017-06-08 22:34 ` Michael Ellerman
2017-06-09 6:57 ` [PATCH v2] " christophe lombard
3 siblings, 0 replies; 5+ messages in thread
From: Michael Ellerman @ 2017-06-08 22:34 UTC (permalink / raw)
To: Frederic Barrat, linuxppc-dev, vaibhav, andrew.donnellan,
clombard, philippe.bergheaud
On Tue, 2017-06-06 at 09:43:41 UTC, 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@linux.vnet.ibm.com>
> Cc: stable@vger.kernel.org
> Fixes: 0712dc7e73e5 ("cxl: Fix issues when unmapping contexts")
Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/cec422c11caeeccae709e9942058b6
cheers
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] cxl: Fix error path on bad ioctl
2017-06-06 9:43 [PATCH v2] cxl: Fix error path on bad ioctl Frederic Barrat
` (2 preceding siblings ...)
2017-06-08 22:34 ` [v2] " Michael Ellerman
@ 2017-06-09 6:57 ` christophe lombard
3 siblings, 0 replies; 5+ messages in thread
From: christophe lombard @ 2017-06-09 6:57 UTC (permalink / raw)
To: Frederic Barrat, linuxppc-dev, vaibhav, andrew.donnellan,
philippe.bergheaud
[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]
Reviewed-by: christophe lombard <clombard@linux.vnet.ibm.com>
Le 06/06/2017 à 11:43, Frederic Barrat a écrit :
> 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@linux.vnet.ibm.com>
> Cc: stable@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) {
[-- Attachment #2: Type: text/html, Size: 1899 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread