diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2026-03-17 19:49:01 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2026-03-17 19:49:01 +0000 |
| commit | 2353fa1aca553883141a7b5d0aa54312a4610412 (patch) | |
| tree | ae4ebf2ae3ea88cdfbe8ed9a2c174dbb6b36332d | |
| parent | 2cf15144daf7ec44cdcd9bf3ef007939b79c361e (diff) | |
LinuxKPI: Fix simple_read_from_buffer for zero-size and off-the-end reads
I noticed that the buf_size < 0 check can never be true (it's a
size_t) and decided to check for this condition by an alternate
expression, and I also noticed that a read_size of 0 would incorrectly
return -EFAULT. Instead, return success for both of these cases as
reading beyond the EOF of a normal file also returns EOF, not EINVAL.
Reviewed by: bz
Sponsored by: AFRL, DARPA
Differential Revision: https://reviews.freebsd.org/D55845
| -rw-r--r-- | sys/compat/linuxkpi/common/include/linux/fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/fs.h b/sys/compat/linuxkpi/common/include/linux/fs.h index 40e1b396fe86..7e28be070850 100644 --- a/sys/compat/linuxkpi/common/include/linux/fs.h +++ b/sys/compat/linuxkpi/common/include/linux/fs.h @@ -368,8 +368,8 @@ simple_read_from_buffer(void __user *dest, size_t read_size, loff_t *ppos, size_t buf_remain = buf_size - *ppos; ssize_t num_read; - if (buf_remain < 0 || buf_remain > buf_size) - return -EINVAL; + if (*ppos >= buf_size || read_size == 0) + return (0); if (read_size > buf_remain) read_size = buf_remain; |
