From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932496AbdCTSNx (ORCPT ); Mon, 20 Mar 2017 14:13:53 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:38351 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932457AbdCTSNO (ORCPT ); Mon, 20 Mar 2017 14:13:14 -0400 From: Colin King To: Patrik Jakobsson , David Airlie , dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/gma500: fix memory leak on edid Date: Mon, 20 Mar 2017 17:56:01 +0000 Message-Id: <20170320175601.23149-1-colin.king@canonical.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King edid is allocated on the call to psb_intel_sdvo_get_edid but not kfree'd at all, causing a memory leak. Fix this by kfree'ing the edid. (This may be null, but kfree can handle null frees). Detected by CoverityScan, CID#1090730 ("Resource Leak") Fixes: 5736995b473b ("gma500: Replace SDVO code with slightly modified version from i915") Signed-off-by: Colin Ian King --- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c index e787d376ba67..f38e6ad1ab9b 100644 --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c @@ -1650,6 +1650,7 @@ static bool psb_intel_sdvo_detect_hdmi_audio(struct drm_connector *connector) edid = psb_intel_sdvo_get_edid(connector); if (edid != NULL && edid->input & DRM_EDID_INPUT_DIGITAL) has_audio = drm_detect_monitor_audio(edid); + kfree(edid); return has_audio; } -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Colin King Subject: [PATCH] drm/gma500: fix memory leak on edid Date: Mon, 20 Mar 2017 17:56:01 +0000 Message-ID: <20170320175601.23149-1-colin.king@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id A38EF6E647 for ; Mon, 20 Mar 2017 17:56:03 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Patrik Jakobsson , David Airlie , dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ29saW4gSWFuIEtpbmcgPGNvbGluLmtpbmdAY2Fub25pY2FsLmNvbT4KCmVkaWQgaXMg YWxsb2NhdGVkIG9uIHRoZSBjYWxsIHRvIHBzYl9pbnRlbF9zZHZvX2dldF9lZGlkIGJ1dCBub3QK a2ZyZWUnZCBhdCBhbGwsIGNhdXNpbmcgYSBtZW1vcnkgbGVhay4gIEZpeCB0aGlzIGJ5IGtmcmVl J2luZwp0aGUgZWRpZC4gIChUaGlzIG1heSBiZSBudWxsLCBidXQga2ZyZWUgY2FuIGhhbmRsZSBu dWxsIGZyZWVzKS4KCkRldGVjdGVkIGJ5IENvdmVyaXR5U2NhbiwgQ0lEIzEwOTA3MzAgKCJSZXNv dXJjZSBMZWFrIikKCkZpeGVzOiA1NzM2OTk1YjQ3M2IgKCJnbWE1MDA6IFJlcGxhY2UgU0RWTyBj b2RlIHdpdGggc2xpZ2h0bHkgbW9kaWZpZWQgdmVyc2lvbiBmcm9tIGk5MTUiKQpTaWduZWQtb2Zm LWJ5OiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmljYWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9nbWE1MDAvcHNiX2ludGVsX3Nkdm8uYyB8IDEgKwogMSBmaWxlIGNoYW5nZWQs IDEgaW5zZXJ0aW9uKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9wc2Jf aW50ZWxfc2R2by5jIGIvZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9wc2JfaW50ZWxfc2R2by5jCmlu ZGV4IGU3ODdkMzc2YmE2Ny4uZjM4ZTZhZDFhYjliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vZ21hNTAwL3BzYl9pbnRlbF9zZHZvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9w c2JfaW50ZWxfc2R2by5jCkBAIC0xNjUwLDYgKzE2NTAsNyBAQCBzdGF0aWMgYm9vbCBwc2JfaW50 ZWxfc2R2b19kZXRlY3RfaGRtaV9hdWRpbyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y KQogCWVkaWQgPSBwc2JfaW50ZWxfc2R2b19nZXRfZWRpZChjb25uZWN0b3IpOwogCWlmIChlZGlk ICE9IE5VTEwgJiYgZWRpZC0+aW5wdXQgJiBEUk1fRURJRF9JTlBVVF9ESUdJVEFMKQogCQloYXNf YXVkaW8gPSBkcm1fZGV0ZWN0X21vbml0b3JfYXVkaW8oZWRpZCk7CisJa2ZyZWUoZWRpZCk7CiAK IAlyZXR1cm4gaGFzX2F1ZGlvOwogfQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK