Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2786647ybg; Mon, 28 Oct 2019 02:20:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyy7hJ6qSpBCqjHmvrF5cYe+Gc6S57aE/HltTcYt2jP0n42I1rcS7YIhjAjmbICdJu9sYSH X-Received: by 2002:aa7:c890:: with SMTP id p16mr18054705eds.296.1572254450226; Mon, 28 Oct 2019 02:20:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572254450; cv=none; d=google.com; s=arc-20160816; b=Xh4EyUqRSX7kuVEAFg1OzLeiKL1fJJ5w8ucK7/ABK3IpsbSr1GcpnL4o06KgbgWwxy 7YE/j9viiNXpMo5ptL8+LmWvYeGDG/T39Xbym3r+Pom1aG7jKlhmDK76W1JNgkQcUybv 5wsm9M50ljeYc7STQpK+pjrz6eU2p8PfFAVnZ4yRLphtb+20RjBxeGClB08NBhqJwVNk vxG0sn0JRaZZsGZ6dK2FSR/ZKtzyFcTE6p+M+NwGsPmhyin7NpiN6jsfANEsdw/QzL8x oxcCL2mMDLwgNAmQC9Cy38P9Kjv3gjOsWRgyIzdk9or7kP7Nf5u8OUknSSlOgcoXd8+S L7Cg== 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=oCwrX+hM+Zqq0K7ViEIDkk11U2/xVbE+APbtrjYvm7mVoSBbmXm+p3sq8d2JbZ/KD6 v7SEZUUKOxstis32lE8e0jehhSx/s89Vxzc66G8+31owRYtgM5kCX1jn5d1+7RBPqQhs ObXG6hFPWJgjTvGllf5LbgpMMQXBMsTnNcWsNS9bQPDrWM7h39GTSvyduC9m7fQBinpi bRyau2Aq8HUgo75FJciXptHDNTARAoT+0cvE4Oi/xkK6lhx56ITH/81ghhVqnrTx6vZs 4E/CeylhWkfJ+phztlO3iWtMuefmDtM8hSxZUWd6A7hf9QVEOte/l3LCEzkI5Y2Z7H7A MSmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Jt66F4HW; 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 i39si6445583eda.88.2019.10.28.02.20.26; Mon, 28 Oct 2019 02:20:50 -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=Jt66F4HW; 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 S1732519AbfJ0VY2 (ORCPT + 99 others); Sun, 27 Oct 2019 17:24:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:46054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732497AbfJ0VY0 (ORCPT ); Sun, 27 Oct 2019 17:24:26 -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 4B6FC21726; Sun, 27 Oct 2019 21:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211465; bh=8jmxZ2IQvza0hiJBvlidENn+RvnEXJ8eFPMGst97j9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jt66F4HWVux8rflFQ84v+s/5sdCScOrps654LGfOy/uJIhe7LXAsSMKlfiklN/aUL oz5GzeW64VY3KLmQVLFigYau3bJ51EACsfIchfrs0YTFW7jHIUXKCYsQcmR2euzgtW Zol/lXHfJ6WaIjfr8fkQotXRL35O9PabfPf1Qb/Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller , Sven Schnelle Subject: [PATCH 5.3 161/197] parisc: Fix vmap memory leak in ioremap()/iounmap() Date: Sun, 27 Oct 2019 22:01:19 +0100 Message-Id: <20191027203401.149437135@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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);