gma500, lvds: Fix use after free and mem leak in psb_intel_lvds_init()
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;'. We may also leak the memory we allocated for 'psb_intel_encoder' if we 'goto failed_connector;' and the variable goes out of scope. 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> Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
972c5ae961
commit
4b2453114f
|
@ -713,7 +713,6 @@ void psb_intel_lvds_init(struct drm_device *dev,
|
||||||
|
|
||||||
psb_intel_encoder =
|
psb_intel_encoder =
|
||||||
kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
|
kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
|
||||||
|
|
||||||
if (!psb_intel_encoder) {
|
if (!psb_intel_encoder) {
|
||||||
dev_err(dev->dev, "psb_intel_encoder allocation error\n");
|
dev_err(dev->dev, "psb_intel_encoder allocation error\n");
|
||||||
return;
|
return;
|
||||||
|
@ -721,10 +720,9 @@ void psb_intel_lvds_init(struct drm_device *dev,
|
||||||
|
|
||||||
psb_intel_connector =
|
psb_intel_connector =
|
||||||
kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
|
kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
|
||||||
|
|
||||||
if (!psb_intel_connector) {
|
if (!psb_intel_connector) {
|
||||||
kfree(psb_intel_encoder);
|
|
||||||
dev_err(dev->dev, "psb_intel_connector allocation error\n");
|
dev_err(dev->dev, "psb_intel_connector allocation error\n");
|
||||||
|
goto failed_encoder;
|
||||||
}
|
}
|
||||||
|
|
||||||
lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL);
|
lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL);
|
||||||
|
@ -862,7 +860,8 @@ failed_blc_i2c:
|
||||||
drm_encoder_cleanup(encoder);
|
drm_encoder_cleanup(encoder);
|
||||||
drm_connector_cleanup(connector);
|
drm_connector_cleanup(connector);
|
||||||
failed_connector:
|
failed_connector:
|
||||||
if (psb_intel_connector)
|
kfree(psb_intel_connector);
|
||||||
kfree(psb_intel_connector);
|
failed_encoder:
|
||||||
|
kfree(psb_intel_encoder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in New Issue