From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 335BD1E4B2; Wed, 21 Feb 2024 13:44:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523051; cv=none; b=qh+cEm4oaYfzKBTSsv1EKyf02jNXDksWjH86VmAAKO9wg6XvTccNMQgmpyoEYKCg5xrtFfIfKsPMwT4fl2lG6X+gzmOdUtC3+nKbzaCFLk9m4f/dyteRgSFHqrfNy25QKJsqQcCIEMnmw6WuEUXp8hDaBMbsrAKmWYssxX6MmOc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523051; c=relaxed/simple; bh=9wrHB8EcUZOxhT840HadSESLMltv9ZA55avbte8wvyY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l9hk1lti0PzLm9cwCdYIgdtckhHI+PzBmROucUoHWD4dQy99ZOGQFSAo05G4dMK4v9rkXRfAgfrUNZcayY1mB6a6c/yxKsyDVmPMdG2FVrXgeDtE8oBajKJsJoyraxjnXYZB0+6hBdXu9sAAcGMRPwViZDvIwb1YSWX85T52hSg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=geUYaeyu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="geUYaeyu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EA25C433F1; Wed, 21 Feb 2024 13:44:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708523051; bh=9wrHB8EcUZOxhT840HadSESLMltv9ZA55avbte8wvyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=geUYaeyuw23cdxG2oB+iqh35IUHYzJ7o68q3ux6/TSHWPPRU8eS2dOOqHCAqndA9d R70iPycJsiYcoD7lei9gWivzwn5eP0KgDHbPEmJVmPgJ1s47GL1LtkXF5To/Fi98Qz tHNATWejSj6xduIc/JTa9mYSk+IH4FO0HFDdACQw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe JAILLET , Vinod Koul , Sasha Levin Subject: [PATCH 5.15 299/476] dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA Date: Wed, 21 Feb 2024 14:05:50 +0100 Message-ID: <20240221130019.051522445@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit 3aa58cb51318e329d203857f7a191678e60bb714 ] This dma_alloc_coherent() is undone neither in the remove function, nor in the error handling path of fsl_qdma_probe(). Switch to the managed version to fix both issues. Fixes: b092529e0aa0 ("dmaengine: fsl-qdma: Add qDMA controller driver for Layerscape SoCs") Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/7f66aa14f59d32b13672dde28602b47deb294e1f.1704621515.git.christophe.jaillet@wanadoo.fr Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/fsl-qdma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c index 5cc887acb05b..69385f32e275 100644 --- a/drivers/dma/fsl-qdma.c +++ b/drivers/dma/fsl-qdma.c @@ -514,11 +514,11 @@ static struct fsl_qdma_queue queue_temp = queue_head + i + (j * queue_num); queue_temp->cq = - dma_alloc_coherent(&pdev->dev, - sizeof(struct fsl_qdma_format) * - queue_size[i], - &queue_temp->bus_addr, - GFP_KERNEL); + dmam_alloc_coherent(&pdev->dev, + sizeof(struct fsl_qdma_format) * + queue_size[i], + &queue_temp->bus_addr, + GFP_KERNEL); if (!queue_temp->cq) return NULL; queue_temp->block_base = fsl_qdma->block_base + -- 2.43.0