| Message ID | 20230413075526.221068-1-liucong2@kylinos.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Fix memory leaks in i915 selftests | expand |
On Thu, Apr 13, 2023 at 03:55:26PM +0800, Cong Liu wrote: > This patch fixes memory leaks on error escapes in function fake_get_pages > > Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation") > Signed-off-by: Cong Liu <liucong2@kylinos.cn> OK, while I was proposing the adjustments suggested by Jani you already replied to the e-mail. I will keep your version. Anyway, next time, please, do not forget to add the r-b's, in this case it was Andrzej's. Andi > --- > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > index 5361ce70d3f2..154801f1c468 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > @@ -69,8 +69,10 @@ static int fake_get_pages(struct drm_i915_gem_object *obj) > > rem = round_up(obj->base.size, BIT(31)) >> 31; > /* restricted by sg_alloc_table */ > - if (overflows_type(rem, unsigned int)) > + if (overflows_type(rem, unsigned int)) { > + kfree(pages); > return -E2BIG; > + } > > if (sg_alloc_table(pages, rem, GFP)) { > kfree(pages); > -- > 2.34.1 > > > No virus found > Checked by Hillstone Network AntiVirus
Hi Andi, thank you for your reminder, next time I will pay attention to my format, and when someone has already reviewed, add the Reviewed-by field Regards. On 2023/4/13 16:44, Andi Shyti wrote: > On Thu, Apr 13, 2023 at 03:55:26PM +0800, Cong Liu wrote: >> This patch fixes memory leaks on error escapes in function fake_get_pages >> >> Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation") >> Signed-off-by: Cong Liu <liucong2@kylinos.cn> > OK, while I was proposing the adjustments suggested by Jani you > already replied to the e-mail. I will keep your version. > > Anyway, next time, please, do not forget to add the r-b's, in > this case it was Andrzej's. > > Andi > >> --- >> drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c >> index 5361ce70d3f2..154801f1c468 100644 >> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c >> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c >> @@ -69,8 +69,10 @@ static int fake_get_pages(struct drm_i915_gem_object *obj) >> >> rem = round_up(obj->base.size, BIT(31)) >> 31; >> /* restricted by sg_alloc_table */ >> - if (overflows_type(rem, unsigned int)) >> + if (overflows_type(rem, unsigned int)) { >> + kfree(pages); >> return -E2BIG; >> + } >> >> if (sg_alloc_table(pages, rem, GFP)) { >> kfree(pages); >> -- >> 2.34.1 >> >> >> No virus found >> Checked by Hillstone Network AntiVirus
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 5361ce70d3f2..154801f1c468 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -69,8 +69,10 @@ static int fake_get_pages(struct drm_i915_gem_object *obj) rem = round_up(obj->base.size, BIT(31)) >> 31; /* restricted by sg_alloc_table */ - if (overflows_type(rem, unsigned int)) + if (overflows_type(rem, unsigned int)) { + kfree(pages); return -E2BIG; + } if (sg_alloc_table(pages, rem, GFP)) { kfree(pages);
This patch fixes memory leaks on error escapes in function fake_get_pages Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation") Signed-off-by: Cong Liu <liucong2@kylinos.cn> --- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)