From: Greg Kroah-Hartman Date: Sat, 13 Apr 2024 05:54:52 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.19.312~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f6090b84ebca106a455e068982bc9d3cf27c804;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch --- diff --git a/queue-5.4/amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch b/queue-5.4/amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch new file mode 100644 index 00000000000..d01f6970a1e --- /dev/null +++ b/queue-5.4/amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch @@ -0,0 +1,32 @@ +From 3b0daecfeac0103aba8b293df07a0cbaf8b43f29 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 12 Apr 2024 06:11:25 +1000 +Subject: amdkfd: use calloc instead of kzalloc to avoid integer overflow + +From: Dave Airlie + +commit 3b0daecfeac0103aba8b293df07a0cbaf8b43f29 upstream. + +This uses calloc instead of doing the multiplication which might +overflow. + +Cc: stable@vger.kernel.org +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +@@ -938,8 +938,8 @@ static int kfd_ioctl_get_process_apertur + * nodes, but not more than args->num_of_nodes as that is + * the amount of memory allocated by user + */ +- pa = kzalloc((sizeof(struct kfd_process_device_apertures) * +- args->num_of_nodes), GFP_KERNEL); ++ pa = kcalloc(args->num_of_nodes, sizeof(struct kfd_process_device_apertures), ++ GFP_KERNEL); + if (!pa) + return -ENOMEM; + diff --git a/queue-5.4/series b/queue-5.4/series index e3ba5ed4cda..770c91dceb2 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,3 +1,4 @@ +amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch documentation-hw-vuln-update-spectre-doc.patch x86-cpu-support-amd-automatic-ibrs.patch x86-bugs-use-sysfs_emit.patch