Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kfifo: fix ternary sign extension bugs

Browse Source 
The intent with this code was to return negative error codes but instead
it returns positives.

The problem is how type promotion works with ternary operations.  These
functions return long, "ret" is an int and "copied" is a u32.  The
negative error code is first cast to u32 so it becomes a high positive and
then cast to long where it's still a positive.

We could fix this by declaring "ret" as a ssize_t but let's just get rid
of the ternaries instead.

Link: https://lkml.kernel.org/r/YIE+/cK1tBzSuQPU@mwanda
Fixes: 5bf2b19320 ("kfifo: add example files to the kernel sample directory")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Stefani Seibold <stefani@seibold.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dan Carpenter 2021-04-29 22:54:15 -07:00 committed by Linus Torvalds
parent ccf33ec4a7
commit 926ee00ea2
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/kfifo/bytestream-example.c
View File

@ -122,8 +122,10 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
ret = kfifo_from_user(&test, buf, count, &copied);
mutex_unlock(&write_lock);
if (ret)
return ret;
return ret ? ret : copied;
return copied;
}
static ssize_t fifo_read(struct file *file, char __user *buf,
@ -138,8 +140,10 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
ret = kfifo_to_user(&test, buf, count, &copied);
mutex_unlock(&read_lock);
if (ret)
return ret;
return ret ? ret : copied;
return copied;
}
static const struct proc_ops fifo_proc_ops = {

8
samples/kfifo/inttype-example.c
View File

@ -115,8 +115,10 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
ret = kfifo_from_user(&test, buf, count, &copied);
mutex_unlock(&write_lock);
if (ret)
return ret;
return ret ? ret : copied;
return copied;
}
static ssize_t fifo_read(struct file *file, char __user *buf,
@ -131,8 +133,10 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
ret = kfifo_to_user(&test, buf, count, &copied);
mutex_unlock(&read_lock);
if (ret)
return ret;
return ret ? ret : copied;
return copied;
}
static const struct proc_ops fifo_proc_ops = {

8
samples/kfifo/record-example.c
View File

@ -129,8 +129,10 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
ret = kfifo_from_user(&test, buf, count, &copied);
mutex_unlock(&write_lock);
if (ret)
return ret;
return ret ? ret : copied;
return copied;
}
static ssize_t fifo_read(struct file *file, char __user *buf,
@ -145,8 +147,10 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
ret = kfifo_to_user(&test, buf, count, &copied);
mutex_unlock(&read_lock);
if (ret)
return ret;
return ret ? ret : copied;
return copied;
}
static const struct proc_ops fifo_proc_ops = {