| Message ID | 176388fa-40fe-4cb4-9aeb-2c91c22130bd@stanley.mountain |
|---|---|
| State | Accepted |
| Commit | 67d15c7aa0864dfd82325c7e7e7d8548b5224c7b |
| Headers | show |
| Series | [v2] accel/qaic: Fix integer overflow in qaic_validate_req() | expand |
On 3/7/2025 1:41 AM, Dan Carpenter wrote: > These are u64 variables that come from the user via > qaic_attach_slice_bo_ioctl(). Use check_add_overflow() to ensure that > the math doesn't have an integer wrapping bug. > > Cc: stable@vger.kernel.org > Fixes: ff13be830333 ("accel/qaic: Add datapath") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Thanks! Reviewed-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
On 3/7/2025 1:41 AM, Dan Carpenter wrote: > These are u64 variables that come from the user via > qaic_attach_slice_bo_ioctl(). Use check_add_overflow() to ensure that > the math doesn't have an integer wrapping bug. > > Cc: stable@vger.kernel.org > Fixes: ff13be830333 ("accel/qaic: Add datapath") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Pushed to drm-misc-fixes -Jeff
diff --git a/drivers/accel/qaic/qaic_data.c b/drivers/accel/qaic/qaic_data.c index c20eb63750f5..631e401fbe4a 100644 --- a/drivers/accel/qaic/qaic_data.c +++ b/drivers/accel/qaic/qaic_data.c @@ -554,6 +554,7 @@ static bool invalid_sem(struct qaic_sem *sem) static int qaic_validate_req(struct qaic_device *qdev, struct qaic_attach_slice_entry *slice_ent, u32 count, u64 total_size) { + u64 total; int i; for (i = 0; i < count; i++) { @@ -563,7 +564,8 @@ static int qaic_validate_req(struct qaic_device *qdev, struct qaic_attach_slice_ invalid_sem(&slice_ent[i].sem2) || invalid_sem(&slice_ent[i].sem3)) return -EINVAL; - if (slice_ent[i].offset + slice_ent[i].size > total_size) + if (check_add_overflow(slice_ent[i].offset, slice_ent[i].size, &total) || + total > total_size) return -EINVAL; }
These are u64 variables that come from the user via qaic_attach_slice_bo_ioctl(). Use check_add_overflow() to ensure that the math doesn't have an integer wrapping bug. Cc: stable@vger.kernel.org Fixes: ff13be830333 ("accel/qaic: Add datapath") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- v2: use check_add_overflow() instead of open coding a check drivers/accel/qaic/qaic_data.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)