From: Jesper Juhl <jj@chaosbits.net>
To: linux-kernel@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org,
Octavian Purdila <octavian.purdila@intel.com>,
Dave Airlie <airlied@redhat.com>,
Greg Kroah-Hartman <gregkh@suse.de>,
Alan Cox <alan@linux.intel.com>, David Airlie <airlied@linux.ie>,
Eric Anholt <eric@anholt.net>,
Jesse Barnes <jesse.barnes@intel.com>
Subject: [PATCH] intel, gma500, lvds: Fix use after free on psb_intel_lvds_init()
Date: Sat, 14 Jan 2012 20:59:33 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.00.1201142056190.11547@swampdragon.chaosbits.net> (raw)
In psb_intel_lvds_init(), if we fail to allocate memory for
'psb_intel_connector' we free the memory we previously allocated for
'psb_intel_encoder', but we then proceed to use that free'd pointer
when we do 'psb_intel_encoder->dev_priv = lvds_priv;'.
I believe the proper way to handle this is to simply return after the
allocation for 'psb_intel_connector' has failed. That is what this
patch does.
While I was there anyway, I also removed the pointless 'if
(psb_intel_connector)' before freeing it at the 'failed_connector:'
label - kfree() deals gracefully with NULL pointers, so it is not
needed.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
drivers/gpu/drm/gma500/psb_intel_lvds.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
I considered adding a new label at the end and use a goto instead, but
settled on this minimal solution. If consolidating all exits from the
function is prefered then I can rework the patch to do that
instead. Just let me know.
Patch is compile tested only since I don't have the hardware to
actually test it properly.
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index a25e4ca..7d23ef9 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -725,6 +725,7 @@ void psb_intel_lvds_init(struct drm_device *dev,
if (!psb_intel_connector) {
kfree(psb_intel_encoder);
dev_err(dev->dev, "psb_intel_connector allocation error\n");
+ return;
}
lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL);
@@ -862,7 +863,6 @@ failed_blc_i2c:
drm_encoder_cleanup(encoder);
drm_connector_cleanup(connector);
failed_connector:
- if (psb_intel_connector)
- kfree(psb_intel_connector);
+ kfree(psb_intel_connector);
}
--
1.7.8.3
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
next reply other threads:[~2012-01-14 19:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-14 19:59 Jesper Juhl [this message]
2012-01-14 20:58 ` [PATCH] intel, gma500, lvds: Fix use after free on psb_intel_lvds_init() Jesper Juhl
2012-01-14 21:15 ` [PATCH] intel, gma500, lvds: Fix use after free and mem leak in psb_intel_lvds_init() Jesper Juhl
2012-01-17 10:15 ` Patrik Jakobsson
2012-01-17 23:20 ` Jesper Juhl
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=alpine.LNX.2.00.1201142056190.11547@swampdragon.chaosbits.net \
--to=jj@chaosbits.net \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=alan@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=gregkh@suse.de \
--cc=jesse.barnes@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=octavian.purdila@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).