From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517179186-2-16941201094193277046 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=1517179185; b=v+Pj23V373JRgLDJ5qoUKu/zSeW2n18fY1RTA0KHNC+rGOC +Cxqv5JV8oXqfPX85SP0UxIXw8/8u3oJd9Y86s/er9aXZ74v/LzEHT2ePZeAgjiW eQdDVDD1hvcmG+YRkwCqjYDPdT1MstIZ6SSpG9RuuI5HCGvhD+HF2nXSxqFn5r4S 5lA7MoQEyvCmbApV9lezX/zFI9pr63e4OWEKdDv5wGqQ5t8UfZkehb3pSf9SNg4f oVlOodfQXlFJU1AZcsHerMx+veLt80f4AmJoXRAwaZeL5bWkpqHMJYmX7N1IP7D2 YOlMphuebtikYPrXBTq26mnsXABqB3IP/KUy+4g== 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=1517179185; bh=VFwWIi I/fEvJGxinGuV4rddlBv0jhAP85IUDDa+LdbM=; b=CRFseUXhvnmqozfeokj/uO YRjGrHBP/q/TTmFqkGeUvjcFQUs4ptTdc4ljT5A5VBlznqnTL5QNbPYCpOgp810y yVF4UPxS2P2+oAke/kHFA0Alb4IG1yPuD43QfZlg4vmGx0T3lKHgl8dusTfFr4X5 eycDe/JITMsNhh4dQkNW9zZa8YTbEmRKlsbPtWPvxSpRe4M1HYpcznAwQ0za9Vb6 RKLQZEaf8gHPkBvWhWOZy6bppNYZCjW8QJFnzcSS/a2M5AoyiltjaXhf+jvbPt09 gS6g64MM/NDPReRA5Y/iSQSLRbjMP8PH8/5xIjNM5kS6EA2MqUxXKVQalYqkY03w == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=L0shwTr/ 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: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=L0shwTr/ 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 S932505AbeA1WjL (ORCPT ); Sun, 28 Jan 2018 17:39:11 -0500 Received: from mail-by2nam03on0094.outbound.protection.outlook.com ([104.47.42.94]:9952 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932491AbeA1WaD (ORCPT ); Sun, 28 Jan 2018 17:30:03 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Russell King , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 31/36] drm/armada: fix leak of crtc structure Thread-Topic: [PATCH AUTOSEL for 4.4 31/36] drm/armada: fix leak of crtc structure Thread-Index: AQHTmIdcnhq8LEL3v0i44XGpbgVn/Q== Date: Sun, 28 Jan 2018 22:28:46 +0000 Message-ID: <20180128222815.29479-31-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-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;MW2PR2101MB1114;7:EZerawQCk8Vpwi+jFqobVBHabvw6dRfghBAI++HNYQ+4CDHpa41TpPdfoaRGH0b463ewhohgHAVCg02BuMsPnBTEZy+Fq2Cioi9fb5WwQVV2hqLTGvYXJd1FQMWIQeJyU8DNYo2qbRMWzpZcnxb0RO+BzxFsbe1YTeqKpOkNO4aO6V2WnzHyTGYath/oKvl14++745cY8igco0YRY/GGNd0gqVEVaZm2aO4rkhYn1Uy1bjnsgvexjNXdQsiTSw7Q x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 4e612a28-b367-4608-6b29-08d5669ea7b0 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: 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:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(107886003)(6666003)(59450400001)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(575784001)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(53936002)(106356001)(2501003)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: GFmfQNKqZah4cyO3vYo5LiMs/8oRQ1IlUJn6gh5kdAvHdyJiFQ1kYtlXrXUwcFQMiC/9zDDerWlyx1Bcs6w43Q== 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: 4e612a28-b367-4608-6b29-08d5669ea7b0 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:46.3130 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 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 cebcab560626..5d68189176cc 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1182,17 +1182,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 */ @@ -1203,13 +1199,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, @@ -1219,7 +1217,7 @@ static int armada_drm_crtc_create(struct drm_device *= drm, struct device *dev, DRM_PLANE_TYPE_PRIMARY); if (ret) { kfree(primary); - return ret; + goto err_crtc; } =20 ret =3D drm_crtc_init_with_planes(drm, &dcrtc->crtc, &primary->base, NULL= , @@ -1238,6 +1236,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