| From 91395a1f74f01103250ec030388093bdeef97930 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 20 Sep 2023 14:36:11 +0200 |
| Subject: kernel: watch_queue: copy user-array safely |
| |
| From: Philipp Stanner <pstanner@redhat.com> |
| |
| [ Upstream commit ca0776571d3163bd03b3e8c9e3da936abfaecbf6 ] |
| |
| Currently, there is no overflow-check with memdup_user(). |
| |
| Use the new function memdup_array_user() instead of memdup_user() for |
| duplicating the user-space array safely. |
| |
| Suggested-by: David Airlie <airlied@redhat.com> |
| Signed-off-by: Philipp Stanner <pstanner@redhat.com> |
| Reviewed-by: Kees Cook <keescook@chromium.org> |
| Reviewed-by: Zack Rusin <zackr@vmware.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-5-pstanner@redhat.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/watch_queue.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c |
| index 28ed71d277bd7..442bb92212f2a 100644 |
| --- a/kernel/watch_queue.c |
| +++ b/kernel/watch_queue.c |
| @@ -332,7 +332,7 @@ long watch_queue_set_filter(struct pipe_inode_info *pipe, |
| filter.__reserved != 0) |
| return -EINVAL; |
| |
| - tf = memdup_user(_filter->filters, filter.nr_filters * sizeof(*tf)); |
| + tf = memdup_array_user(_filter->filters, filter.nr_filters, sizeof(*tf)); |
| if (IS_ERR(tf)) |
| return PTR_ERR(tf); |
| |
| -- |
| 2.42.0 |
| |
