From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
linux-kernel <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH v3] drm/gma500: fix double freeing
Date: Thu, 07 Apr 2016 21:22:27 +0530 [thread overview]
Message-ID: <5706823B.7060800@gmail.com> (raw)
In-Reply-To: <CAMeQTsaPPh5m1rHtPLYP85N6hVH-KRvcyf+XhP8TrZiqhmDE=w@mail.gmail.com>
On Wednesday 09 December 2015 05:50 PM, Patrik Jakobsson wrote:
> On Wed, Dec 9, 2015 at 12:53 PM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
>> On Thu, Oct 08, 2015 at 06:17:48PM +0530, Sudip Mukherjee wrote:
>>> We are allocating backing using psbfb_alloc() and so
>>> backing->stolen is always true. So we were freeing backing two times.
>>> Moreover if we follow the execution path then we should be freeing
>>> backing after we have released the helper. So remove the one which frees
>>> backing before the helper is released.
>>> While at it the error labels are also renamed to give a meaningful
>>> name.
>>>
>>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>>> Reviewed-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
>>> ---
>>
>> This patch was never picked up. It will not apply now.
>>
>> Daniel, please let me know if you want me to resend after making
>> necessary changes.
>
> I will pick this up and pass it along to Dave. Sorry for the delay.
This was not picked up. But I guess it is still true. Do you want me to
rebase and send it again..
regards
sudip
>
> -Patrik
>
>>
>> regards
>> sudip
>>
>>> drivers/gpu/drm/gma500/framebuffer.c | 13 ++++---------
>>> 1 file changed, 4 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
>>> index 2eaf1b3..52e2bf3 100644
>>> --- a/drivers/gpu/drm/gma500/framebuffer.c
>>> +++ b/drivers/gpu/drm/gma500/framebuffer.c
>>> @@ -411,7 +411,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
>>> info = drm_fb_helper_alloc_fbi(&fbdev->psb_fb_helper);
>>> if (IS_ERR(info)) {
>>> ret = PTR_ERR(info);
>>> - goto out_err1;
>>> + goto err_unlock;
>>> }
>>> info->par = fbdev;
>>>
>>> @@ -419,7 +419,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
>>>
>>> ret = psb_framebuffer_init(dev, psbfb, &mode_cmd, backing);
>>> if (ret)
>>> - goto out_unref;
>>> + goto err_release;
>>>
>>> fb = &psbfb->base;
>>> psbfb->fbdev = info;
>>> @@ -465,14 +465,9 @@ static int psbfb_create(struct psb_fbdev *fbdev,
>>>
>>> mutex_unlock(&dev->struct_mutex);
>>> return 0;
>>> -out_unref:
>>> - if (backing->stolen)
>>> - psb_gtt_free_range(dev, backing);
>>> - else
>>> - drm_gem_object_unreference(&backing->gem);
>>> -
>>> +err_release:
>>> drm_fb_helper_release_fbi(&fbdev->psb_fb_helper);
>>> -out_err1:
>>> +err_unlock:
>>> mutex_unlock(&dev->struct_mutex);
>>> psb_gtt_free_range(dev, backing);
>>> return ret;
>>> --
>>> 1.9.1
>>>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
linux-kernel <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH v3] drm/gma500: fix double freeing
Date: Thu, 07 Apr 2016 21:22:27 +0530 [thread overview]
Message-ID: <5706823B.7060800@gmail.com> (raw)
In-Reply-To: <CAMeQTsaPPh5m1rHtPLYP85N6hVH-KRvcyf+XhP8TrZiqhmDE=w@mail.gmail.com>
On Wednesday 09 December 2015 05:50 PM, Patrik Jakobsson wrote:
> On Wed, Dec 9, 2015 at 12:53 PM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
>> On Thu, Oct 08, 2015 at 06:17:48PM +0530, Sudip Mukherjee wrote:
>>> We are allocating backing using psbfb_alloc() and so
>>> backing->stolen is always true. So we were freeing backing two times.
>>> Moreover if we follow the execution path then we should be freeing
>>> backing after we have released the helper. So remove the one which frees
>>> backing before the helper is released.
>>> While at it the error labels are also renamed to give a meaningful
>>> name.
>>>
>>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>>> Reviewed-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
>>> ---
>>
>> This patch was never picked up. It will not apply now.
>>
>> Daniel, please let me know if you want me to resend after making
>> necessary changes.
>
> I will pick this up and pass it along to Dave. Sorry for the delay.
This was not picked up. But I guess it is still true. Do you want me to
rebase and send it again..
regards
sudip
>
> -Patrik
>
>>
>> regards
>> sudip
>>
>>> drivers/gpu/drm/gma500/framebuffer.c | 13 ++++---------
>>> 1 file changed, 4 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
>>> index 2eaf1b3..52e2bf3 100644
>>> --- a/drivers/gpu/drm/gma500/framebuffer.c
>>> +++ b/drivers/gpu/drm/gma500/framebuffer.c
>>> @@ -411,7 +411,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
>>> info = drm_fb_helper_alloc_fbi(&fbdev->psb_fb_helper);
>>> if (IS_ERR(info)) {
>>> ret = PTR_ERR(info);
>>> - goto out_err1;
>>> + goto err_unlock;
>>> }
>>> info->par = fbdev;
>>>
>>> @@ -419,7 +419,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
>>>
>>> ret = psb_framebuffer_init(dev, psbfb, &mode_cmd, backing);
>>> if (ret)
>>> - goto out_unref;
>>> + goto err_release;
>>>
>>> fb = &psbfb->base;
>>> psbfb->fbdev = info;
>>> @@ -465,14 +465,9 @@ static int psbfb_create(struct psb_fbdev *fbdev,
>>>
>>> mutex_unlock(&dev->struct_mutex);
>>> return 0;
>>> -out_unref:
>>> - if (backing->stolen)
>>> - psb_gtt_free_range(dev, backing);
>>> - else
>>> - drm_gem_object_unreference(&backing->gem);
>>> -
>>> +err_release:
>>> drm_fb_helper_release_fbi(&fbdev->psb_fb_helper);
>>> -out_err1:
>>> +err_unlock:
>>> mutex_unlock(&dev->struct_mutex);
>>> psb_gtt_free_range(dev, backing);
>>> return ret;
>>> --
>>> 1.9.1
>>>
next prev parent reply other threads:[~2016-04-07 15:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 15:48 [PATCH v2] drm/gma500: fix double freeing Sudip Mukherjee
2015-10-06 15:48 ` Sudip Mukherjee
2015-10-07 20:55 ` Patrik Jakobsson
2015-10-07 20:55 ` Patrik Jakobsson
2015-10-08 12:47 ` [PATCH v3] " Sudip Mukherjee
2015-10-08 12:47 ` Sudip Mukherjee
2015-12-09 11:53 ` Sudip Mukherjee
2015-12-09 11:53 ` Sudip Mukherjee
2015-12-09 12:20 ` Patrik Jakobsson
2015-12-09 12:20 ` Patrik Jakobsson
2016-04-07 15:52 ` Sudip Mukherjee [this message]
2016-04-07 15:52 ` Sudip Mukherjee
2016-04-07 17:20 ` Patrik Jakobsson
2016-04-07 17:20 ` Patrik Jakobsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5706823B.7060800@gmail.com \
--to=sudipm.mukherjee@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patrik.r.jakobsson@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.