4.20-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Daniel Vetter <[email protected]>

commit 7cdf33ab02e01300e7e6289acbac9cd8759f8712 upstream.

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: [email protected]
Signed-off-by: Daniel Vetter <[email protected]>
Cc: Haneen Mohammed <[email protected]>
Cc: Sean Paul <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Rodrigo Siqueira <[email protected]>
Cc: Gustavo Padovan <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Link: 
https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/gpu/drm/vkms/vkms_plane.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- 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_pl
                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;
 


Reply via email to