diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 08:27:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 08:27:54 +0100 |
| commit | 1f836f5b10f2524d33efde47d2b694b861ecf319 (patch) | |
| tree | b52188b30d08bff1fe6376832753ca5e0a7e9d15 /kernel/sched/psi.c | |
| parent | mei: remove unused includes from pci-{me,txe}.c (diff) | |
| parent | Linux 5.6-rc3 (diff) | |
| download | wireguard-linux-1f836f5b10f2524d33efde47d2b694b861ecf319.tar.xz wireguard-linux-1f836f5b10f2524d33efde47d2b694b861ecf319.zip | |
Merge 5.6-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/sched/psi.c')
| -rw-r--r-- | kernel/sched/psi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index ac4bd0ca11cc..028520702717 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -1199,6 +1199,9 @@ static ssize_t psi_write(struct file *file, const char __user *user_buf, if (static_branch_likely(&psi_disabled)) return -EOPNOTSUPP; + if (!nbytes) + return -EINVAL; + buf_size = min(nbytes, sizeof(buf)); if (copy_from_user(buf, user_buf, buf_size)) return -EFAULT; |