diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2020-06-16 12:42:21 +0100 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2020-06-30 14:26:51 +0300 |
| commit | 607856a835539c465015882328f1e37e95de8ee7 (patch) | |
| tree | 87843338f50f2761ac9c44b0aa3bc2fbfc402468 | |
| parent | drm/i915: fix a couple of spelling mistakes in kernel parameter help text (diff) | |
| download | linux-dev-607856a835539c465015882328f1e37e95de8ee7.tar.xz linux-dev-607856a835539c465015882328f1e37e95de8ee7.zip | |
drm/i915/display: fix missing null check on allocated dsb object
Currently there is no null check for a failed memory allocation
on the dsb object and without this a null pointer dereference
error can occur. Fix this by adding a null check.
Note: added a drm_err message in keeping with the error message style
in the function.
Addresses-Coverity: ("Dereference null return")
Fixes: afeda4f3b1c8 ("drm/i915/dsb: Pre allocate and late cleanup of cmd buffer")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200616114221.73971-1-colin.king@canonical.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dsb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c index 24e6d63e2d47..566fa72427b3 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb.c +++ b/drivers/gpu/drm/i915/display/intel_dsb.c @@ -271,6 +271,10 @@ void intel_dsb_prepare(struct intel_crtc_state *crtc_state) return; dsb = kmalloc(sizeof(*dsb), GFP_KERNEL); + if (!dsb) { + drm_err(&i915->drm, "DSB object creation failed\n"); + return; + } wakeref = intel_runtime_pm_get(&i915->runtime_pm); |