linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ocxl: Fix potential bad errno on irq allocation
@ 2018-02-16 13:01 Frederic Barrat
  2018-02-20 23:21 ` Andrew Donnellan
  2018-02-21 13:43 ` Michael Ellerman
  0 siblings, 2 replies; 3+ messages in thread
From: Frederic Barrat @ 2018-02-16 13:01 UTC (permalink / raw)
  To: andrew.donnellan, linuxppc-dev; +Cc: dan.carpenter

Fix some issues found by a static checker:

When allocating an AFU interrupt, if the driver cannot copy the output
parameters to userland, the errno value was not set to EFAULT

Remove a (now) useless cast.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
---
 drivers/misc/ocxl/file.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
index 2dd2db9bc1c9..337462e1569f 100644
--- a/drivers/misc/ocxl/file.c
+++ b/drivers/misc/ocxl/file.c
@@ -133,8 +133,10 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
 		if (!rc) {
 			rc = copy_to_user((u64 __user *) args, &irq_offset,
 					sizeof(irq_offset));
-			if (rc)
+			if (rc) {
 				ocxl_afu_irq_free(ctx, irq_offset);
+				return -EFAULT;
+			}
 		}
 		break;
 
@@ -329,7 +331,7 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count,
 
 	used += sizeof(header);
 
-	rc = (ssize_t) used;
+	rc = used;
 	return rc;
 }
 
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ocxl: Fix potential bad errno on irq allocation
  2018-02-16 13:01 [PATCH] ocxl: Fix potential bad errno on irq allocation Frederic Barrat
@ 2018-02-20 23:21 ` Andrew Donnellan
  2018-02-21 13:43 ` Michael Ellerman
  1 sibling, 0 replies; 3+ messages in thread
From: Andrew Donnellan @ 2018-02-20 23:21 UTC (permalink / raw)
  To: Frederic Barrat, linuxppc-dev; +Cc: dan.carpenter

On 17/02/18 00:01, Frederic Barrat wrote:
> Fix some issues found by a static checker:
> 
> When allocating an AFU interrupt, if the driver cannot copy the output
> parameters to userland, the errno value was not set to EFAULT
> 
> Remove a (now) useless cast.
> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>

Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>

> ---
>   drivers/misc/ocxl/file.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
> index 2dd2db9bc1c9..337462e1569f 100644
> --- a/drivers/misc/ocxl/file.c
> +++ b/drivers/misc/ocxl/file.c
> @@ -133,8 +133,10 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
>   		if (!rc) {
>   			rc = copy_to_user((u64 __user *) args, &irq_offset,
>   					sizeof(irq_offset));
> -			if (rc)
> +			if (rc) {
>   				ocxl_afu_irq_free(ctx, irq_offset);
> +				return -EFAULT;
> +			}
>   		}
>   		break;
> 
> @@ -329,7 +331,7 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count,
> 
>   	used += sizeof(header);
> 
> -	rc = (ssize_t) used;
> +	rc = used;
>   	return rc;
>   }
> 

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: ocxl: Fix potential bad errno on irq allocation
  2018-02-16 13:01 [PATCH] ocxl: Fix potential bad errno on irq allocation Frederic Barrat
  2018-02-20 23:21 ` Andrew Donnellan
@ 2018-02-21 13:43 ` Michael Ellerman
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Ellerman @ 2018-02-21 13:43 UTC (permalink / raw)
  To: Frederic Barrat, andrew.donnellan, linuxppc-dev; +Cc: dan.carpenter

On Fri, 2018-02-16 at 13:01:18 UTC, Frederic Barrat wrote:
> Fix some issues found by a static checker:
> 
> When allocating an AFU interrupt, if the driver cannot copy the output
> parameters to userland, the errno value was not set to EFAULT
> 
> Remove a (now) useless cast.
> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/423688abd9ab654044bddd82eb5983

cheers

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-02-21 13:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-16 13:01 [PATCH] ocxl: Fix potential bad errno on irq allocation Frederic Barrat
2018-02-20 23:21 ` Andrew Donnellan
2018-02-21 13:43 ` Michael Ellerman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).