From: Greg Kroah-Hartman Date: Sat, 13 Apr 2024 05:55:17 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v4.19.312~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05af4647908f72ecf990aa391eb2b7e0aa6ab8c3;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch --- diff --git a/queue-6.1/amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch b/queue-6.1/amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch new file mode 100644 index 00000000000..356effbab87 --- /dev/null +++ b/queue-6.1/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 +@@ -765,8 +765,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-6.1/series b/queue-6.1/series index 8e7c218db1b..ed4ddbb62c8 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1,3 +1,4 @@ +amdkfd-use-calloc-instead-of-kzalloc-to-avoid-integer-overflow.patch wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch bnx2x-fix-firmware-version-string-character-counts.patch wifi-rtw89-pci-enlarge-rx-dma-buffer-to-consider-siz.patch