From patchwork Fri Feb 24 15:22:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Povi=C5=A1er?= X-Patchwork-Id: 61373 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp978424wrd; Fri, 24 Feb 2023 07:36:25 -0800 (PST) X-Google-Smtp-Source: AK7set+GToYP/zlNKiJ9/W3owW3v58XMi4GDgsk2l3H75RMbcgXup76gkbjQjb5RtuUHzkUu0nNl X-Received: by 2002:a17:906:470a:b0:8b1:fc58:a4ad with SMTP id y10-20020a170906470a00b008b1fc58a4admr24149600ejq.11.1677252985155; Fri, 24 Feb 2023 07:36:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677252985; cv=none; d=google.com; s=arc-20160816; b=apjEDnx27qBfjULfpmGpjeHozEQtZnFuz/Na8eAzzTWDOYW8J3/b/OsvN6YGLnMGGa q1434Bh/0eVCT+8OsJs5piVo7w3P7G8pAeEOjjLXUtIHfXgheSXJes5pjNAMzs5XSVUT sWUa1hpfL0jV6T6GAlmVztqM+mEVsN8guhHZ4SDGfm7JxGG8AEqD8JzFCxSQwpkMi2Qe BUjxBau7YDkzL1nxod0YVaA7aKMwuo7dytfLbLvwLOz+rZ3fbyiMvmid/1GIWGZCqgZR KAogzkkL04Vd5wNlVOkDb+2IiQ04OYu5cFa6bH6PjCFexWY2bfpIm15MX6CUZF+sMhql S3zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:dkim-signature :from; bh=StaFikSjZpFQ+BUcIlQfwrxM+sCnU+rvBEoVvGQ2nmk=; b=Yfv0rnEbs/s4KHXHrqvIsbw5lC72NZxsWJjByJ3ry1sbVOvqEhGEi0g23rOFOK7qn1 3SsdZN4hXiz/o7jwCLB/r0CYQpvpJbf9MDy67mIjnCpfMx4VlnlKcYapDPPwhTVslJzP MZ5g/TTyvsgg3bPv8nMKaqB4+/rzC8eOQqB5j9YzNNTXvcl490HrpnjVVitPa/XkuXt7 ZtRNV9vgR9f+2lcWaw3OX8gxRgXjYt/hy/23CmlSlw3/mWOz6DCK4VU20fKX7EIoL3Eg qGCj2w2fRw0v0pJbVtYPGdCsuT6lH4h13oMi6Gx0DC7XEeMbX7RwTXTXQB8cpE76rpjY dmNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=fOvbi5u7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mf24-20020a1709071a5800b008ccc0fd3d13si14615856ejc.348.2023.02.24.07.36.01; Fri, 24 Feb 2023 07:36:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=fOvbi5u7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230354AbjBXPWr (ORCPT + 99 others); Fri, 24 Feb 2023 10:22:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230311AbjBXPWj (ORCPT ); Fri, 24 Feb 2023 10:22:39 -0500 Received: from hutie.ust.cz (unknown [IPv6:2a03:3b40:fe:f0::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81D676EB1A; Fri, 24 Feb 2023 07:22:31 -0800 (PST) From: =?utf-8?q?Martin_Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1677252145; bh=StaFikSjZpFQ+BUcIlQfwrxM+sCnU+rvBEoVvGQ2nmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fOvbi5u7TfZbdRb/5lxtFwcD+ebCgEW+egwfuLYdhfzxpB2grc3CsYFX5m3JosTZ3 5CP7I59IxQyKuSrYvD7i+g0nm3Z7Anzbz6LcVbPDatTuX7bCwQrAa765yoNtapNLkx VYNi76Ina7OQb60oYtDZ5wzW7ec+E3dPHKVJiV+4= To: Hector Martin , Sven Peter , Vinod Koul Cc: Alyssa Rosenzweig , =?utf-8?q?Martin_Povi=C5=A1er?= , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] dmaengine: apple-admac: Fix 'current_tx' not getting freed Date: Fri, 24 Feb 2023 16:22:21 +0100 Message-Id: <20230224152222.26732-2-povik+lin@cutebit.org> In-Reply-To: <20230224152222.26732-1-povik+lin@cutebit.org> References: <20230224152222.26732-1-povik+lin@cutebit.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_FAIL,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758727226099914756?= X-GMAIL-MSGID: =?utf-8?q?1758727226099914756?= In terminate_all we should queue up all submitted descriptors to be freed. We do that for the content of the 'issued' and 'submitted' lists, but the 'current_tx' descriptor falls through the cracks as it's removed from the 'issued' list once it gets assigned to be the current descriptor. Explicitly queue up freeing of the 'current_tx' descriptor to address a memory leak that is otherwise present. Fixes: b127315d9a78 ("dmaengine: apple-admac: Add Apple ADMAC driver") Signed-off-by: Martin PoviĊĦer --- drivers/dma/apple-admac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index 00cbfafe0ed9..497bb65b7d6d 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -512,7 +512,10 @@ static int admac_terminate_all(struct dma_chan *chan) admac_stop_chan(adchan); admac_reset_rings(adchan); - adchan->current_tx = NULL; + if (adchan->current_tx) { + list_add_tail(&adchan->current_tx->node, &adchan->to_free); + adchan->current_tx = NULL; + } /* * Descriptors can only be freed after the tasklet * has been killed (in admac_synchronize).