From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770AbcD1L3P (ORCPT ); Thu, 28 Apr 2016 07:29:15 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36431 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750876AbcD1L3N (ORCPT ); Thu, 28 Apr 2016 07:29:13 -0400 Message-ID: <5721F3D7.3030608@gmail.com> Date: Thu, 28 Apr 2016 13:28:23 +0200 From: Vyacheslav Yurkov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH] drivers/base: wrong return value of dmam_declare_coherent_memory Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi guys, I found an issue in managed version of dma_declare_coherent_memory, i.e. in dmam_declare_coherent_memory. It looks like the return value of dma_declare_coherent_memory is zero in case of error and a requested flag on success, which dmam_* version doesn't take into account and this leads to leaking of resources. --- Yours sincerely, Vyacheslav V. Yurkov P.S.: I'm not subscribed to the maillist, so please include me in CC when responding to this Email. --- --- linux-4.5.2/drivers/base/dma-mapping.c.orig 2016-04-20 08:46:35.000000000 +0200 +++ linux-4.5.2/drivers/base/dma-mapping.c 2016-04-28 10:15:34.295080491 +0200 @@ -198,10 +198,15 @@ int dmam_declare_coherent_memory(struct rc = dma_declare_coherent_memory(dev, phys_addr, device_addr, size, flags); - if (rc == 0) + + if ((flags & DMA_MEMORY_MAP) == DMA_MEMORY_MAP || + (flags & DMA_MEMORY_IO) == DMA_MEMORY_IO) { devres_add(dev, res); - else + rc = 0; + } else { devres_free(res); + rc = -ENOMEM; + } return rc; } Signed-off-by: Vyacheslav Yurkov