From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 042A6C433DB for ; Tue, 5 Jan 2021 08:05:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D5362222A for ; Tue, 5 Jan 2021 08:05:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D5362222A Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Content-ID:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wAx8eSUCakJzHAuIK+X9ZMg2nQ6ngzX85YV1IXNRbvM=; b=CTZt+8I7IGDpCRfku2cHIEKh4 +ZE2RrOYK/RugiuZRx+jpC3AXckHCA3GOFYmSWR0SRzvS9f8OboFIuyQdA3BBtpWf7iuibAmARb+9 WoXpER6srZvOOb7FyA7xcUke5z26heL64D5awduajQ+GBQyA10Jt/pnbTXSEOfv+ug21I6VUs26TU 4Oid5QXIV3EZNt/Cj8bzEdUo0aVO9CjiwGyumYqaI9vxOOfq95L45zqBQuOqGLcL0cwD7RTMtELDw 9urg6ZUYAichkhHneST5ig8j7Nn4PALu0yhRrS7XGd1QRdp7fIXtL5ctRZygbpm1EyUBlebC+b6z5 vLKpTjx+Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwhJS-00065k-0v; Tue, 05 Jan 2021 08:03:30 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwhJP-00064l-3D for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2021 08:03:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1609833807; x=1641369807; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=+UsbZonySPZz3aELHRFoSIEaA3c+NaIo7h4D+e1vFXw=; b=OVwGAJ3IfwwifOG8IdZ+codRZlNQGTXgKBe9UrTBk6CiLGKbCgGKV0KJ g/faw3GxqAvON8kEp+smIqAJhhiqd79cYUWsxY9GtYOeNuz3Bp2qvfnm0 59GAvybTq2lsFOQaVoNG9z05KUDfa864zsxydPNK3PG0XnBsVXm9dEEYq uTfOPwbVWlekSj1iI5BaM5MnzCz06wRLqN8mQdbMBlKK9L2ElriiT6p6w 99AbmvyhgbNxSVAdYJsHITuF4SBIwrjq61CaSGNtQDUGP03w5UONWmj4/ frHu20RPkQiKbHuWgUpeiK6rY4D5tBK6XJADwFZstGpabolNlt6xlY74q g==; IronPort-SDR: tO9yqfOdFhYASC/Ikmx/YYTGVX6/QUvp23viFSJGDp6WZEASSB8MsK/y8BqRXYGr7ojW9DRDj0 oxK0eGWstoDcuigj4YIE796Tmaxv5ogbI/B7VTMNi05mFcxznYlyXK3bYH0J6+W4/Urc38sphx fsJnC4dlAyzHyZBihxvKLqyKSIgOKwjKJnV/bMOFy2bOQZvtgjHWf4a4Oh8ks3CEgiFa5/jgoZ Ia1Mlx78aLhUMk5mXrpuRnDvepNdxUVZdD2zhrtmNMvxNYgnYNuM7C1kELjH7TtjJfQtKUBezE GLo= X-IronPort-AV: E=Sophos;i="5.78,476,1599548400"; d="scan'208";a="104274175" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Jan 2021 01:03:23 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 5 Jan 2021 01:03:22 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3 via Frontend Transport; Tue, 5 Jan 2021 01:03:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bkgBLPD3lRmA/OFGlmMjPhbOBRY8Eufod+C9v9Zg63MdabU9RkVu7Kx1HMpZTz/XMAvQjtBkaXqXBkY0QKCw6GblUrE1JZ/YgcYoPgATIwqc1QnAhmjUT+GUbraF1JaOZ1uxyVg5YPCqF7FB4trfrsyerhhF40giX1+5xSothORmgU/K5hr+pxTluW5tHJ5lKHJlUDKuMDpWLmj5E4kJ4y2h7Kx6aadbwk/eCES3r3NYfGV87v6nL85Bfm5JFOrE9pKtEkLHhYJVBLD2WdzyCNEd0yNdeYCY6Xx+AviblCkZUrkiLGV/3NxeIfTtBzdaiqjfLrcndmkkKbLWq9e+eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+UsbZonySPZz3aELHRFoSIEaA3c+NaIo7h4D+e1vFXw=; b=WOj6nu2AGrn5FqT7DbKxg2YzciW0IdsWzF3qQb9bQKmsmOwZUMkOAssKnrLdbgVM8v0U+q9Zk2EgVYVQpw7JFNzRCAc5lvs5q0P+EF6S1bx9IEMWHR9uVCQRWMMZIbm27wRMy6d4ja320PqPf9t7T0ZjzoQpZkY8Yom1ucBVnn1Jj/S7VqJLpsr/aojM/T4PXO5XeMEPxSmUhE2c+cZtY/ov98Lhtgq5tqciQ9lseDJTP7VdLp0oJMjo796bB2pydlqu776EW/96tMKR9FoTPMzskofo3gR/3/LeqR7pudcUJPfNn4A78/G0W/Il3bNMPfntle5vZbJOFotwEUpQoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+UsbZonySPZz3aELHRFoSIEaA3c+NaIo7h4D+e1vFXw=; b=bP2Fliqc9qrcyEAjzJvKzn11ciKqtsJUimbmEYOv+9UdHhcHsDX0yV8WpAhxKfJjuuJneV/MS1fUaGbqY8LMXIRw0RwGvcWslndHpGXHnVK0uKBF6Hggqsf4y4heNUuOExsrTp4pb17R2/GsUgZv+iq+LUAXv9k4o2OxgRqbF0c= Received: from SA2PR11MB4874.namprd11.prod.outlook.com (2603:10b6:806:f9::23) by SN6PR11MB2573.namprd11.prod.outlook.com (2603:10b6:805:53::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.20; Tue, 5 Jan 2021 08:03:20 +0000 Received: from SA2PR11MB4874.namprd11.prod.outlook.com ([fe80::6903:3212:cc9e:761]) by SA2PR11MB4874.namprd11.prod.outlook.com ([fe80::6903:3212:cc9e:761%7]) with mapi id 15.20.3721.024; Tue, 5 Jan 2021 08:03:20 +0000 From: To: Subject: Re: [PATCH 4.19] dmaengine: at_hdmac: Fix memory leak Thread-Topic: [PATCH 4.19] dmaengine: at_hdmac: Fix memory leak Thread-Index: AQHWkYFbVNgbQZmRd0SqW2sKLrUKIA== Date: Tue, 5 Jan 2021 08:03:20 +0000 Message-ID: References: <20200920082838.GA813@amd> <80065eac-7dce-aadf-51ef-9a290973b9ec@microchip.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 authentication-results: linuxfoundation.org; dkim=none (message not signed) header.d=none;linuxfoundation.org; dmarc=none action=none header.from=microchip.com; x-originating-ip: [79.115.63.137] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9df76a06-a063-42b3-5759-08d8b1505db8 x-ms-traffictypediagnostic: SN6PR11MB2573: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:989; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AbADRiVxcZYfCuQNDhgMNUzOMF972uBkRMB3QHMSI7TEZFiWZu0AQ/YTzKGyvMf1fYMTWFR/gO4yWH3OqFAGw0IJAQCzuMSNe37WpyyPc/DkRHsKrzJ/mqWYs5A3PShJnU40IxaQ99aWo+Omq214AZ2aSRSerhObg8B8R6hV0bibxkTD5VzLyPY781uhq7yQ9jqPGLUg3xUM/TS6uDQqBwDoOdIrQ2GmarcmuV9xDIKRrLXsETjXnemIsNbqpYzXDewWFNZy5DGisaZ1yXclbak7nAYXT4P+jlJwLS5tib2XaztlQqT717E1NFnVSrVMePlpf5fHXAKIRuhsmF2u/uHxLBAPxw6O/b1M1DLhArWZ70sARSAkOY2xh23st2GtGBSklc7hjhCB3B07A9oA0/gvaCYOehIia8XFQIxumx8XxhIKqh7m3br7t6El9kNJvwC7+srNfRz+vdVCwlllGe1pWXavc7WxpwABH6u7B6Q= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR11MB4874.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(376002)(39860400002)(136003)(366004)(346002)(186003)(86362001)(31696002)(53546011)(2616005)(478600001)(36756003)(6506007)(4326008)(31686004)(6916009)(91956017)(8936002)(26005)(83380400001)(8676002)(76116006)(66946007)(5660300002)(66446008)(66476007)(66556008)(64756008)(71200400001)(316002)(2906002)(6512007)(54906003)(6486002)(43740500002)(45980500001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?utf-8?B?azhNck9TTmZGNzJ6dGIxSTlkOXg1N3dQZ2ZTSUdKcmtjdFloRWlKMElXY212?= =?utf-8?B?ZmNTc3NGYUJhNFhPZjFheC9xN0NXcVorRWt0M3VtVWVUZ0pzb1kzUi9RRXhj?= =?utf-8?B?dGFPSkZxcDVkbXcxZTV5RUV6NEY5TitiSzMxY0F1bW9lbVcyN0J4bHNZT09W?= =?utf-8?B?d3A4UWJQZmVPK3A1NzljZDRoSTFkTU1RN1VXdHhNWGFwejZTTytpWFVxTEdR?= =?utf-8?B?ZHhIQkRVWFpLTEl5aHdQNWFDRm1wYlRFMjEwaGViY04xVnpxdE5rWDYwZjZI?= =?utf-8?B?RGFSMzdBZWJqajBXM25OcUZIUzJ0OUtsdTZ5SzlRQkpsSDNXdXNiRWRYQmJq?= =?utf-8?B?Z1ZVYXFuKzN1WkpwZTl3SC9rdkNPQ1VXT21MTjAyMmN0NDVnaERlZkF1ZnhJ?= =?utf-8?B?anF3bGhUOFNOTmdMMW5seXFudklFSFRDdytGSktXdS9WR09jQ0JMdGgyL2FW?= =?utf-8?B?SU01SXhZMjZ0SDRNbHZ5Mk5mbGphaTVoQ1NqMHhGZ0VpMmpCWTh6bTZEZjV0?= =?utf-8?B?cS9qdmRDWTF6ZFQ0Nm85NGM2NytiWHlxSHdqM3hZRGFLZE9UTkpFaU1HQnpl?= =?utf-8?B?dzRPY2V6TWgxUFhzSDRiN1FHN3dBdlhZVlBtRW1VbVU5Z2wrTUhkYjNGdzNX?= =?utf-8?B?Z3Z5aVEraUN5Sjh5U0NBQ2FtcTh1RTV4TkdzTk94Z05ybld0TldRZFAvazdR?= =?utf-8?B?U096SHNzdkF3NkxCOE1ORVVDVDkrNVF1VEt0RmcxSmlZRFlrVUZLWk1YMlN3?= =?utf-8?B?QW42MklEM3BUTDV4eVNWa1NvcUh2VDZ1Q1NoYVRYTC9SZ3lsb0plM05rNmFL?= =?utf-8?B?bXFLbjlEdzVjMUV0N0RLQm9YNVhKYUxZQ0tSVlhrVkt3K1QwVDJ5OGhqcW1j?= =?utf-8?B?dzZMUk50bjJsdHpDdXdDaDZZWEM4RHV5L3c5ampsTTZNYzNmWkNFZC81WSt5?= =?utf-8?B?SkNMWTBFTEV0K05ta0RjN3YwZnVNV24xOC9IZmtBV2MzWUJQcEQ1MUpNcmRr?= =?utf-8?B?aDArbzRYdk9SaHIyWHZqcm03bEVDMU0wYXJxYm15SG90YlBZKyswU3Vzeko5?= =?utf-8?B?MkFjbXQxOWRGeEFuZHFrMlRqeWttK3pWRm9leFBLWHh1SVJhTTNDMkoyM2dW?= =?utf-8?B?N0wvbE9UcGZjSmhWZlRTQnoyZzZWd1R4VmM1a2FaMXlGMitkRjB6V2ZEK0NW?= =?utf-8?B?L2lGUWtHNEs0cU4ySHpIWHA3alNxS2xHWWE3K1FnTG5uQ1Rjc3hldm5uYTJH?= =?utf-8?B?c3BmcUpJRlBldzY4MVZJZUlaSDEwMGcvRm1xSXZxaWF0c1dzSzNBK2lPNFdH?= =?utf-8?Q?oh2OGH0GFv0BI=3D?= Content-ID: <415F1FBF1204254AA79B4000C2E8E86C@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SA2PR11MB4874.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9df76a06-a063-42b3-5759-08d8b1505db8 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2021 08:03:20.0130 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 844pml6fdAGZ0vv17msmmOj2/2UYLaSVTIQDm6DEjwNUGIi2KgSx2LtIkYyc7dFAMBIneoKHUbp/RrqMI2V0FYRTCWPTajQfStYBP5gBAMI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2573 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210105_030327_478512_83C32C93 X-CRM114-Status: GOOD ( 18.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, vkoul@kernel.org, Ludovic.Desroches@microchip.com, pavel@ucw.cz, dmaengine@vger.kernel.org, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 1/4/21 1:02 PM, Greg KH wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On Wed, Sep 23, 2020 at 08:19:18AM +0000, Tudor.Ambarus@microchip.com wrote: >> On 9/23/20 11:13 AM, Tudor.Ambarus@microchip.com wrote: >>> Hi, Pavel, >>> >>> On 9/20/20 11:28 AM, Pavel Machek wrote: >>>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe >>>> >>>> This fixes memory leak in at_hdmac. Mainline does not have the same >>>> problem. >>>> >>>> Signed-off-by: Pavel Machek (CIP) >>>> >>>> diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c >>>> index 86427f6ba78c..0847b2055857 100644 >>>> --- a/drivers/dma/at_hdmac.c >>>> +++ b/drivers/dma/at_hdmac.c >>>> @@ -1714,8 +1714,10 @@ static struct dma_chan *at_dma_xlate(struct of_phandle_args *dma_spec, >>>> atslave->dma_dev = &dmac_pdev->dev; >>>> >>>> chan = dma_request_channel(mask, at_dma_filter, atslave); >>>> - if (!chan) >>>> + if (!chan) { >>>> + kfree(atslave); >>>> return NULL; >>>> + } >>> >>> Thanks for submitting this to stable. While the fix is good, you can instead >>> cherry-pick the commit that hit upstream. In order to do that cleanly on top >>> of v4.19.145, you have to pick two other fixes: >>> >>> commit a6e7f19c9100 ("dmaengine: at_hdmac: Substitute kzalloc with kmalloc") >>> commit 3832b78b3ec2 ("dmaengine: at_hdmac: add missing put_device() call in at_dma_xlate()")>>> commit a6e7f19c9100 ("dmaengine: at_hdmac: Substitute kzalloc with kmalloc") >> >> this last commit should have been >> commit e097eb7473d9 ("dmaengine: at_hdmac: add missing kfree() call in at_dma_xlate()") >> >> bad copy and paste :) > > So are all 3 of those needed on both 5.4.y and 4.19.y to resolve this > issue? > Yes. I've just cherry-picked all three commits on both v5.4.86 and v4.19.164, everything looks ok. I also compiled using sama5_defconfig, all good. The order in which they should be taken is 1/ a6e7f19c9100, then 2/ 3832b78b3ec2, and 3/ e097eb7473d9. Cheers, ta _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel