diff options
| author | Daniel Vetter | 2018-11-28 11:10:33 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2018-11-29 10:30:39 +0100 |
| commit | 7cdf33ab02e01300e7e6289acbac9cd8759f8712 (patch) | |
| tree | 2a71c1a6a286b660bf128e02a85b2d3514be66ae | |
| parent | drm/pl111: add of_node_put() (diff) | |
| download | kernel-qcow2-linux-7cdf33ab02e01300e7e6289acbac9cd8759f8712.tar.gz kernel-qcow2-linux-7cdf33ab02e01300e7e6289acbac9cd8759f8712.tar.xz kernel-qcow2-linux-7cdf33ab02e01300e7e6289acbac9cd8759f8712.zip | |
drm/vkms: Fix plane duplicate_state
We need to handle allocation failures and bail out. While at it, tune
the allocation failures down to debug level.
syzbot injected an allocation failure and then hit this WARN_ON.
Reported-by: syzbot+eb6e5365f23c02517dda@syzkaller.appspotmail.com
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20181128101033.4840-1-daniel.vetter@ffwll.ch
| -rw-r--r-- | drivers/gpu/drm/vkms/vkms_plane.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 7041007396ae..e3bcea4b4891 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -23,8 +23,11 @@ vkms_plane_duplicate_state(struct drm_plane *plane) return NULL; crc_data = kzalloc(sizeof(*crc_data), GFP_KERNEL); - if (WARN_ON(!crc_data)) - DRM_INFO("Couldn't allocate crc_data"); + if (!crc_data) { + DRM_DEBUG_KMS("Couldn't allocate crc_data\n"); + kfree(vkms_state); + return NULL; + } vkms_state->crc_data = crc_data; |