request for 4.14-stable: ffdf16edfbbe ("drm/i915/gvt: fix memory leak of a cmd_entry struct on error exit path")

request for 4.14-stable: ffdf16edfbbe ("drm/i915/gvt: fix memory leak of a cmd_entry struct on error exit path")

[Sudip Mukherjee]

[-- Attachment #1: Type: text/plain, Size: 136 bytes --]

Hi Greg,

This was not marked for stable but seems it should be in stable.
Please apply to your queue of 4.14-stable.

--
Regards
Sudip

[-- Attachment #2: 0001-drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch --]
[-- Type: text/x-diff, Size: 1303 bytes --]

>From 2f98e9fe07c5ed6a36646f71e7eb5486ca17db3e Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 10 Apr 2018 13:33:12 +0100
Subject: [PATCH] drm/i915/gvt: fix memory leak of a cmd_entry struct on error
 exit path

commit ffdf16edfbbe77f5f5c3c87fe8d7387ecd16241b upstream

The error exit path when a duplicate is found does not kfree and cmd_entry
struct and hence there is a small memory leak.  Fix this by kfree'ing it.

Detected by CoverityScan, CID#1370198 ("Resource Leak")

Fixes: be1da7070aea ("drm/i915/gvt: vGPU command scanner")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
 drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index d4726a3358a4..d6993c2707d1 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -2802,6 +2802,7 @@ static int init_cmd_table(struct intel_gvt *gvt)
 		if (info) {
 			gvt_err("%s %s duplicated\n", e->info->name,
 					info->name);
+			kfree(e);
 			return -EEXIST;
 		}
 
-- 
2.11.0

Re: request for 4.14-stable: ffdf16edfbbe ("drm/i915/gvt: fix memory leak of a cmd_entry struct on error exit path")

[Sasha Levin]

On Tue, Oct 23, 2018 at 10:44:45AM +0100, Sudip Mukherjee wrote:
>Hi Greg,
>
>This was not marked for stable but seems it should be in stable.
>Please apply to your queue of 4.14-stable.

Hi Sudip,

The i915 maintainers want to explicitly tag patches for stable, and
avoid backporting non-tagged patches.

I can queue it up if one of the maintainers will ack it.

--
Thanks,
Sasha

Re: request for 4.14-stable: ffdf16edfbbe ("drm/i915/gvt: fix memory leak of a cmd_entry struct on error exit path")

[Zhenyu Wang]

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

On 2018.10.31 10:38:19 -0400, Sasha Levin wrote:
> On Tue, Oct 23, 2018 at 10:44:45AM +0100, Sudip Mukherjee wrote:
> > Hi Greg,
> > 
> > This was not marked for stable but seems it should be in stable.
> > Please apply to your queue of 4.14-stable.
> 
> Hi Sudip,
> 
> The i915 maintainers want to explicitly tag patches for stable, and
> avoid backporting non-tagged patches.
> 
> I can queue it up if one of the maintainers will ack it.
> 

It looks good to me for backport.

Acked-by: Zhenyu Wang <zhenyuw@linux.intel.com>

thanks

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: request for 4.14-stable: ffdf16edfbbe ("drm/i915/gvt: fix memory leak of a cmd_entry struct on error exit path")

[Sasha Levin]

On Thu, Nov 01, 2018 at 10:30:12AM +0800, Zhenyu Wang wrote:
>On 2018.10.31 10:38:19 -0400, Sasha Levin wrote:
>> On Tue, Oct 23, 2018 at 10:44:45AM +0100, Sudip Mukherjee wrote:
>> > Hi Greg,
>> >
>> > This was not marked for stable but seems it should be in stable.
>> > Please apply to your queue of 4.14-stable.
>>
>> Hi Sudip,
>>
>> The i915 maintainers want to explicitly tag patches for stable, and
>> avoid backporting non-tagged patches.
>>
>> I can queue it up if one of the maintainers will ack it.
>>
>
>It looks good to me for backport.
>
>Acked-by: Zhenyu Wang <zhenyuw@linux.intel.com>

Queued up, thanks!

--
Thanks,
Sasha