fs/proc/task_mmu: prevent integer overflow in pagemap_scan_get_args()
Subsystems (4)
PATCH 1/1 fs/proc/task_mmu: prevent integer overflow in pagemap_scan_get_args()
The "arg->vec_len" variable is a u64 that comes from the user at the start of the function. The "arg->vec_len * sizeof(struct page_region))" multiplication can lead to integer wrapping. Use size_mul() to avoid that.
Also the size_add/mul() functions work on unsigned long so for 32bit systems we need to ensure that "arg->vec_len" fits in an unsigned long.
--- fs/proc/task_mmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/proc/task_mmu.c +3 -1
@@ -2665,8 +2665,10 @@ static int pagemap_scan_get_args(struct pm_scan_arg *arg,return -EFAULT ;if (!arg->vec && arg->vec_len)return -EINVAL ; +if (UINT_MAX ==SIZE_MAX && arg->vec_len >SIZE_MAX ) +return -EINVAL ;if (arg->vec && !access_ok ((void __user *)(long )arg->vec, - arg->vec_len *sizeof (struct page_region ))) +size_mul (arg->vec_len,sizeof (struct page_region ))))return -EFAULT ;/* Fixup default values */
Signature · 1 line
2.45.2
Quoted 6 lines · Dan Carpenter
The "
arg->vec_len" variable is a u64 that comes from the user at the start of the function. The "arg->vec_len*sizeof(struct page_region))" multiplication can lead to integer wrapping. Usesize_mul()to avoid that.
Quoted 6 lines
Also the size_add/mul() functions work on unsigned long so for 32bit systems we need to ensure that "
arg->vec_len" fits in an unsigned long.Fixes 52526ca7fdb9 ("fs/proc/task_mmu: implement IOCTL to get and optionally clear info about PTEs")Signed-off-by Dan Carpenter <[email protected]>
fs/proc/task_mmu.c static int pagemap_scan_get_args(struct pm_scan_arg *arg, · line 2668
Quoted 13 lines
--- fs/proc/task_mmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/proc/task_mmu.c +1
-0@@ -2665,8 +2665,10 @@ static int pagemap_scan_get_args(struct pm_scan_arg *arg,return -EFAULT ;if (!arg->vec && arg->vec_len)return -EINVAL ; +if (UINT_MAX ==SIZE_MAX && arg->vec_len >SIZE_MAX )
nit: arg->vec_len > SIZE_MAX / sizeof(struct page_region)
Thanks,
Andrei
Quoted 20 lines · Andrei Vagin
Quoted 6 lines · Dan Carpenter
The "
arg->vec_len" variable is a u64 that comes from the user at the start of the function. The "arg->vec_len*sizeof(struct page_region))" multiplication can lead to integer wrapping. Usesize_mul()to avoid that.Quoted 6 lines
Also the size_add/mul() functions work on unsigned long so for 32bit systems we need to ensure that "
arg->vec_len" fits in an unsigned long.Fixes 52526ca7fdb9 ("fs/proc/task_mmu: implement IOCTL to get and optionally clear info about PTEs")Signed-off-by Dan Carpenter <[email protected]>Acked-by Andrei Vagin <[email protected]>Quoted 4 lines
--- fs/proc/task_mmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 11 lines
fs/proc/task_mmu.c static int pagemap_scan_get_args(struct pm_scan_arg *arg, · line 2668
Quoted 9 lines
fs/proc/task_mmu.c +1
-0@@ -2665,8 +2665,10 @@ static int pagemap_scan_get_args(struct pm_scan_arg *arg,return -EFAULT ;if (!arg->vec && arg->vec_len)return -EINVAL ; +if (UINT_MAX ==SIZE_MAX && arg->vec_len >SIZE_MAX )nit:
arg->vec_len>SIZE_MAX/sizeof(struct page_region)
I don't like open coding integer overflow checks now that we have size_add(). Historically, we've done a poor job writing them correctly.
Probably the right thing is to add the > SIZE_MAX check to size_add/mul().
#define size_add(a, b) ({ \
typeof(a) __a = (a); \
typeof(b) __b = (b); \
unsigned long __res; \
if (__a >= SIZE_MAX || __b >= SIZE_MAX) \
__res = ULONG_MAX; \
else \
__res = __size_add(__a, __b); \
__res; \
})But I think you'd trigger compiler warnings if a or b were a u32 so probably we'd need to use a _Generic() or something.
regards,
dan carpenter