Commit 5ffa8285 authored by Dan Carpenter's avatar Dan Carpenter Committed by Arnd Bergmann
Browse files

soc: aspeed: fix a ternary sign expansion bug 



The intent here was to return negative error codes but it actually
returns positive values.  The problem is that type promotion with
ternary operations is quite complicated.

"ret" is an int.  "copied" is a u32.  And the snoop_file_read() function
returns long.  What happens is that "ret" is cast to u32 and becomes
positive then it's cast to long and it's still positive.

Fix this by removing the ternary so that "ret" is type promoted directly
to long.

Fixes: 3772e5da ("drivers/misc: Aspeed LPC snoop output using misc chardev")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Reviewed-by: default avatarPatrick Venture <venture@google.com>
Link: https://lore.kernel.org/r/YIE90PSXsMTa2Y8n@mwanda
Link: https://lore.kernel.org/r/20210423000919.1249474-1-joel@jms.id.au

'
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8c0bd213

drivers/soc/aspeed/aspeed-lpc-snoop.c

+3 −1
Original line number Diff line number Diff line
@@ -94,8 +94,10 @@ static ssize_t snoop_file_read(struct file *file, char __user *buffer, 
			return -EINTR;

	}

	ret = kfifo_to_user(&chan->fifo, buffer, count, &copied);

	if (ret)

		return ret;



	return ret ? ret : copied;

	return copied;

}



static __poll_t snoop_file_poll(struct file *file,