From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180366-2-11864721266806014338 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180366; b=MsehRQ+26vEUybpEuywhZ/x3xwt3DvtjI01p5SdF9xD1I+W fqlZZzH8TZpKQyW2tWYowKksQLZ3NFmFqfK978xAXwSE8hFvbiNjxCebzuEMRRaa ywkIB4pi838SNFkMGdWdpjjjBFbhowqJI9vWGuOMf/s/LOR+pgyItg1hErZWeidp p1joZvP97dEitbyRcbEBAp41UdqIbA+IlZF0jcePULVYU0K+5kkZCEznjRay0xj6 w90tUfWagocpF+qw+zPP4jJRLpqX66UT5skuX3d5NVDMxwPSugyI4A460eUCX1w4 zoUzeFchP1VOSS2WpOxiudVIcd0mPb2HUuBDTJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180366; bh=wCgi2J /YsIUkTgo6zehoQSlheIXU3VNc5anw/7lSkws=; b=R8kNl95gIxo8V66nCITG4K pD0RsoMLo9UJ35g6uidXT7paWEZPwUOzotAYCeT8JSz9CVsrLaMttT7sX+zVyc7U 1ixlo2cZbjn3ld6+kDAnznZ3n2/4UuhKwO3PIu1QuLWEya4oBVUNu2P9e9lZuVP/ 1pu+Lkfy0Hfsw5NKcFRO8tvmaNwAG7IzWi2Pegm1FtIPlfcEJGkSIuUZklygjGK7 GWN/whLMPPOtQ29v7E8Q1pzYFOx6sG+0yccSJlzKNsjffQoB8CuJzNVSkmNXOdZy vuBVol3T1vr+MUvqbhi99fYlQFxZLwJ4o/FwS0yhN+DUjBHWbCCCL/WsETysZ0dA == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=dwVTf2Ts x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=dwVTf2Ts x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933255AbeA1W7A (ORCPT ); Sun, 28 Jan 2018 17:59:00 -0500 Received: from mail-bn3nam01on0113.outbound.protection.outlook.com ([104.47.33.113]:60480 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753540AbeA1W1z (ORCPT ); Sun, 28 Jan 2018 17:27:55 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Russell King , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 088/100] drm/armada: fix leak of crtc structure Thread-Topic: [PATCH AUTOSEL for 4.14 088/100] drm/armada: fix leak of crtc structure Thread-Index: AQHTmIcbxyKdv/DIX0y6H1p84pLfpg== Date: Sun, 28 Jan 2018 22:26:56 +0000 Message-ID: <20180128222547.7398-88-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1018;7:q5NSMXDsNE4Ke8jzyZvKRaiL7pvIe1Qg2FzYngq2vAu0zuRpVhcgutjqqe14U2pV89gtkvHBTn8J+Xn+EtlOAwW2dye7JwdCBJiF3NQEFTe9bitzndJ/AGM5Ab+bpJ8xhMZO55qFl/I39BqtcUH8HILQtwri89dJsg3yfcABLALEZtND38G+7LeHCI4PtJUym6OSaK4P7J908EDkeHBGH8sLHBWC04qU3FtBL933yzTODroM8ifUy9FqdzGhS8FG x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d2b654bb-6d7b-489b-2649-08d5669e5a6c x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1018; x-ms-traffictypediagnostic: MW2PR2101MB1018: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1018;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1018; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(39860400002)(366004)(346002)(376002)(199004)(189003)(53936002)(2501003)(6436002)(575784001)(86362001)(6486002)(5250100002)(26005)(102836004)(6512007)(59450400001)(76176011)(6116002)(2900100001)(3846002)(36756003)(305945005)(7736002)(316002)(3660700001)(22452003)(3280700002)(54906003)(110136005)(99286004)(186003)(97736004)(1076002)(86612001)(81166006)(6666003)(2906002)(106356001)(14454004)(66066001)(4326008)(68736007)(5660300001)(25786009)(8936002)(10290500003)(81156014)(72206003)(107886003)(10090500001)(478600001)(2950100002)(105586002)(8676002)(6506007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1018;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: qeaMPRVeo0Ib2Fcp79G5es/qvFUAtBZBwFBa1Pc3DF/CxeZbzACXpSPO3jy4+V/hZse/9ijX0MdTvih+Ycg/ww== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2b654bb-6d7b-489b-2649-08d5669e5a6c X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:56.8643 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1018 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Russell King [ Upstream commit 33cd3c07a976e11c3c4cc6b0b3db6760ad1590c5 ] Fix the leak of the CRTC structure in the failure paths of armada_drm_crtc_create(). Signed-off-by: Russell King Signed-off-by: Sasha Levin --- drivers/gpu/drm/armada/armada_crtc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/= armada_crtc.c index 2a4d163ac76f..79ce877bf45f 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1225,17 +1225,13 @@ static int armada_drm_crtc_create(struct drm_device= *drm, struct device *dev, =20 ret =3D devm_request_irq(dev, irq, armada_drm_irq, 0, "armada_drm_crtc", dcrtc); - if (ret < 0) { - kfree(dcrtc); - return ret; - } + if (ret < 0) + goto err_crtc; =20 if (dcrtc->variant->init) { ret =3D dcrtc->variant->init(dcrtc, dev); - if (ret) { - kfree(dcrtc); - return ret; - } + if (ret) + goto err_crtc; } =20 /* Ensure AXI pipeline is enabled */ @@ -1246,13 +1242,15 @@ static int armada_drm_crtc_create(struct drm_device= *drm, struct device *dev, dcrtc->crtc.port =3D port; =20 primary =3D kzalloc(sizeof(*primary), GFP_KERNEL); - if (!primary) - return -ENOMEM; + if (!primary) { + ret =3D -ENOMEM; + goto err_crtc; + } =20 ret =3D armada_drm_plane_init(primary); if (ret) { kfree(primary); - return ret; + goto err_crtc; } =20 ret =3D drm_universal_plane_init(drm, &primary->base, 0, @@ -1263,7 +1261,7 @@ static int armada_drm_crtc_create(struct drm_device *= drm, struct device *dev, DRM_PLANE_TYPE_PRIMARY, NULL); if (ret) { kfree(primary); - return ret; + goto err_crtc; } =20 ret =3D drm_crtc_init_with_planes(drm, &dcrtc->crtc, &primary->base, NULL= , @@ -1282,6 +1280,9 @@ static int armada_drm_crtc_create(struct drm_device *= drm, struct device *dev, =20 err_crtc_init: primary->base.funcs->destroy(&primary->base); +err_crtc: + kfree(dcrtc); + return ret; } =20 --=20 2.11.0