summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-04-27 12:12:08 +0300
committerWilly Tarreau <w@1wt.eu>2017-11-02 07:16:26 +0100
commit7e25c935ec7b43c088d21b9c8e4a6b970375d933 (patch)
treefceb103bfbcd363b7a34de6396dacaa9a6dc2433
parenta72c279dfbfa5b6c5832f16960d8dce31f27645b (diff)
downloadlinux-stable-7e25c935ec7b43c088d21b9c8e4a6b970375d933.tar.gz
linux-stable-7e25c935ec7b43c088d21b9c8e4a6b970375d933.zip
drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve()
commit f0c62e9878024300319ba2438adc7b06c6b9c448 upstream. If vmalloc() fails then we need to a bit of cleanup before returning. Cc: <stable@vger.kernel.org> Fixes: fb1d9738ca05 ("drm/vmwgfx: Add DRM driver for VMware Virtual GPU") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index 89664933861f..a3a70283bded 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -368,6 +368,8 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
return fifo_state->static_buffer;
else {
fifo_state->dynamic_buffer = vmalloc(bytes);
+ if (!fifo_state->dynamic_buffer)
+ goto out_err;
return fifo_state->dynamic_buffer;
}
}