Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2631835ybg; Sun, 27 Oct 2019 23:10:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqy8QcBkK75yTj4/Aa3UWfpcozkEeiq0Tn7GXrD8JBzmPqGHM28wla0Ux7x+JSwbJ5fOWFyg X-Received: by 2002:a17:906:5007:: with SMTP id s7mr15153804ejj.181.1572243024207; Sun, 27 Oct 2019 23:10:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572243024; cv=none; d=google.com; s=arc-20160816; b=aqNP8ZFrz3/zvlHZGzAmjK065gsXIusIXBp9ldy3+RzqynzcoahtciEC031/wf58I6 YSgHxZ288LKeutcMSdqS0pgfi0bMXleFi8VXFiEBbc1MJIoca9sAcGq9VEuxNZaMT0s5 /FpIiEM5c2atFgY0cnLI9eJMHhm+1+JNKsCbi6XgPzudVGGuZDKMRdldZuACGdRhgT3s 6MZHROPEnO3TQAL0ynxxfxdEvT5RUK/UtVV+Itx8aW5MoKGJlbY07sX5skFxkb1hH4HA hRw2t3TAKydW79x7lzptWIPt+OIx+QjFI2c2BhmncF3W9OyqW8bVGcuG2WAJ8G9ywBuS gZHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4+MIFuPk28nSduPN4tNhESeizehUV6sVEKIr/9Eg23o=; b=KiK722GioPswj8X8ttM673fvgAYIXPOzYDe9sEgth51/UBdxYSyC8Mf/hKjJaphRvM 9O8PMwIeEnjnPonQ7h+K+8Meov1Mm2vXeUR9B767eG8UmrKyuSL2oJEmKrN7PN8pV8Om DFzg93sQJ3C2z1VABeQfHyBxncJA1Bj6zOIS2lmu6s9LVa8xDuytUjMtlh6FWNBrQ+Wa DA9refhnJLa50k7jop6nroOEZ0gzPQxatytd880Z4+UstLA0pitESF28zu5EQcUBES8s EOmn5s4i7UBl8fN5kc349tb6RRzZsWJvqdYzr5A8mLBCeu+QSK+5xqB66S/Gw3zKYiZZ 9hPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hsI21zOH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v18si5489181ejd.115.2019.10.27.23.10.00; Sun, 27 Oct 2019 23:10:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hsI21zOH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730716AbfJ0VPv (ORCPT + 99 others); Sun, 27 Oct 2019 17:15:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:35280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730707AbfJ0VPt (ORCPT ); Sun, 27 Oct 2019 17:15:49 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F2A52070B; Sun, 27 Oct 2019 21:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210948; bh=8jmxZ2IQvza0hiJBvlidENn+RvnEXJ8eFPMGst97j9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hsI21zOHMf3Wc6VeF/5wHeesRgfgPyTV7Ycx4spIRVBBkIhRRgk6sI+ZHDtyaGvdy /sR8jN8QBh62Wb7uicGqBgFv9GQvYgdfHHRtDsbA7PoJF8GOt8isfqICcNg2X8XCE+ Gqr2YahOTQ6WskkchPsQkogQ06r0FItvx9CYc7cU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller , Sven Schnelle Subject: [PATCH 4.19 71/93] parisc: Fix vmap memory leak in ioremap()/iounmap() Date: Sun, 27 Oct 2019 22:01:23 +0100 Message-Id: <20191027203309.163217642@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203251.029297948@linuxfoundation.org> References: <20191027203251.029297948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Helge Deller commit 513f7f747e1cba81f28a436911fba0b485878ebd upstream. Sven noticed that calling ioremap() and iounmap() multiple times leads to a vmap memory leak: vmap allocation for size 4198400 failed: use vmalloc= to increase size It seems we missed calling vunmap() in iounmap(). Signed-off-by: Helge Deller Noticed-by: Sven Schnelle Cc: # v3.16+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/mm/ioremap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c @@ -3,7 +3,7 @@ * arch/parisc/mm/ioremap.c * * (C) Copyright 1995 1996 Linus Torvalds - * (C) Copyright 2001-2006 Helge Deller + * (C) Copyright 2001-2019 Helge Deller * (C) Copyright 2005 Kyle McMartin */ @@ -84,7 +84,7 @@ void __iomem * __ioremap(unsigned long p addr = (void __iomem *) area->addr; if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, phys_addr, pgprot)) { - vfree(addr); + vunmap(addr); return NULL; } @@ -92,9 +92,11 @@ void __iomem * __ioremap(unsigned long p } EXPORT_SYMBOL(__ioremap); -void iounmap(const volatile void __iomem *addr) +void iounmap(const volatile void __iomem *io_addr) { - if (addr > high_memory) - return vfree((void *) (PAGE_MASK & (unsigned long __force) addr)); + unsigned long addr = (unsigned long)io_addr & PAGE_MASK; + + if (is_vmalloc_addr((void *)addr)) + vunmap((void *)addr); } EXPORT_SYMBOL(iounmap);