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

Subsystems: char and misc drivers, the rest

STALE3355d

5 messages, 5 authors, 2017-06-09 · open the first message on its own page

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

From: Frederic Barrat <hidden>
Date: 2017-06-06 09:43:55

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 <redacted>
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) {

-- 
2.11.0

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

From: Vaibhav Jain <hidden>
Date: 2017-06-08 05:43:50

Hi Fred,

Thanks for addressing the review comments.

Frederic Barrat [off-list ref] 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 <redacted>
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 <redacted>

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

From: Andrew Donnellan <hidden>
Date: 2017-06-08 05:57:12

Reviewed-by: Andrew Donnellan <redacted>

On 06/06/17 19:43, Frederic Barrat wrote:

quoted hunk

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 <redacted>
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

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

From: Michael Ellerman <hidden>
Date: 2017-06-08 22:34:46

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 <redacted>
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

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

From: christophe lombard <hidden>
Date: 2017-06-09 06:57:54

Reviewed-by: christophe lombard <redacted>


Le 06/06/2017 à 11:43, Frederic Barrat a écrit :

quoted hunk

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 <redacted>
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) {

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help