summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2023-10-08 18:57:31 -0700
committerPindar Yang <pindaryang@google.com>2023-10-11 03:16:56 +0000
commit0181055d6a66f1e9c5db23ca120c885eaafcdde8 (patch)
tree95ea5133599012e963b4a9dfd1c335a2ad880925
parentd189615d99899161efdee2f6284ecf80319772b2 (diff)
parent1896a2b4ea755ff63e623837bc8cfdd6d9c56adc (diff)
downloadgpu-0181055d6a66f1e9c5db23ca120c885eaafcdde8.tar.gz
Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
Bug: 300854197 SBMerger: 558810260 Change-Id: I1fd011faa1af3472ac4ef0b70560f44da49cdf2d Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--mali_kbase/mali_kbase_vinstr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mali_kbase/mali_kbase_vinstr.c b/mali_kbase/mali_kbase_vinstr.c
index 3fce09c..eb6911e 100644
--- a/mali_kbase/mali_kbase_vinstr.c
+++ b/mali_kbase/mali_kbase_vinstr.c
@@ -457,7 +457,7 @@ static int kbasep_vinstr_client_create(
errcode = -ENOMEM;
vcli->dump_bufs_meta = kmalloc_array(
- setup->buffer_count, sizeof(*vcli->dump_bufs_meta), GFP_KERNEL);
+ setup->buffer_count, sizeof(*vcli->dump_bufs_meta), GFP_KERNEL | __GFP_ZERO);
if (!vcli->dump_bufs_meta)
goto error;