diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-08-09 15:40:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-08-09 15:41:33 +1000 |
| commit | 6ca847a947d9da958047dba570d4727069a4861b (patch) | |
| tree | 2d1c63d57abcf7ae63b81a4a5b08024cda989993 | |
| parent | f536579c148249505b388d525ac1866e080fd66a (diff) | |
| parent | 6b7c3b86f0b63134b2ab56508921a0853ffa687a (diff) | |
| download | linux-6ca847a947d9da958047dba570d4727069a4861b.tar.gz | |
Merge branch 'vmwgfx-fixes-5.3' of git://people.freedesktop.org/~thomash/linux into drm-fixes
One single memory leak fix.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom "VMware" <thomas@shipmail.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190808094615.31040-1-thomas@shipmail.org
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c index e4e09d47c5c0e0..59e9d05ab928b4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -389,8 +389,10 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, break; } - if (retries == RETRIES) + if (retries == RETRIES) { + kfree(reply); return -EINVAL; + } *msg_len = reply_len; *msg = reply; |