evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/msm/sde: fix null pointer dereference"

Browse source
This commit is contained in:
Linux Build Service Account 2019-05-08 03:00:04 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5ee084c812
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpu/drm/msm/sde/sde_core_irq.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2015-2017,2019 The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -388,10 +388,28 @@ void sde_core_irq_preinstall(struct sde_kms *sde_kms)
sde_kms->irq_obj.total_irqs = sde_kms->hw_intr->irq_idx_tbl_size; sde_kms->irq_obj.total_irqs = sde_kms->hw_intr->irq_idx_tbl_size;
sde_kms->irq_obj.irq_cb_tbl = kcalloc(sde_kms->irq_obj.total_irqs, sde_kms->irq_obj.irq_cb_tbl = kcalloc(sde_kms->irq_obj.total_irqs,
sizeof(struct list_head), GFP_KERNEL); sizeof(struct list_head), GFP_KERNEL);
if (sde_kms->irq_obj.irq_cb_tbl == NULL) {
SDE_ERROR("Failed to allocate\n");
return;
}
sde_kms->irq_obj.enable_counts = kcalloc(sde_kms->irq_obj.total_irqs, sde_kms->irq_obj.enable_counts = kcalloc(sde_kms->irq_obj.total_irqs,
sizeof(atomic_t), GFP_KERNEL); sizeof(atomic_t), GFP_KERNEL);
if (sde_kms->irq_obj.enable_counts == NULL) {
kfree(sde_kms->irq_obj.irq_cb_tbl);
sde_kms->irq_obj.irq_cb_tbl = NULL;
SDE_ERROR("Failed to allocate\n");
return;
}
sde_kms->irq_obj.irq_counts = kcalloc(sde_kms->irq_obj.total_irqs, sde_kms->irq_obj.irq_counts = kcalloc(sde_kms->irq_obj.total_irqs,
sizeof(atomic_t), GFP_KERNEL); sizeof(atomic_t), GFP_KERNEL);
if (sde_kms->irq_obj.irq_counts == NULL) {
kfree(sde_kms->irq_obj.irq_cb_tbl);
kfree(sde_kms->irq_obj.enable_counts);
sde_kms->irq_obj.irq_cb_tbl = NULL;
sde_kms->irq_obj.enable_counts = NULL;
SDE_ERROR("Failed to allocate\n");
return;
}
for (i = 0; i < sde_kms->irq_obj.total_irqs; i++) { for (i = 0; i < sde_kms->irq_obj.total_irqs; i++) {
INIT_LIST_HEAD(&sde_kms->irq_obj.irq_cb_tbl[i]); INIT_LIST_HEAD(&sde_kms->irq_obj.irq_cb_tbl[i]);
atomic_set(&sde_kms->irq_obj.enable_counts[i], 0); atomic_set(&sde_kms->irq_obj.enable_counts[i], 0);