Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2241342ybg; Sun, 27 Oct 2019 14:11:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyr1fz5ehTDEe1RLODPBBIITLQfnVaKTdcP0Ax5K/0W9/ZwzpvHthnhfsAFSRLgxd99D+ck X-Received: by 2002:a17:906:e2c2:: with SMTP id gr2mr5781892ejb.31.1572210672954; Sun, 27 Oct 2019 14:11:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572210672; cv=none; d=google.com; s=arc-20160816; b=Ci8ZO/5xVNsu61DI32YgO0oJbftTnu/sPWzilNrZwVQJRTJVO9AoJuioTlWQmVuejG Bom9/vex9MoRaqSTSUDGG2ZEI3shCUNYLs5m0T2g/tCYkkpxpDapmxb7wKZd4DqJI2c6 yN87XKgsgtq56y2mLgR+ln3EyzSbQ4OHK4rT7zOOKvR1gfRp02MXj7Q+tLcLC1DZPlHd ASVPKvJdExy5cSRQt7wujrXxv3drpQYbggqeKXuUgsaMgE1MttsmtMyZuByK/5mH8EA2 ci4D4hkl0SRNFjoSfwDWdbnVUhKo0u3Vvn5zSl9t8j5M7nhP7yeiXlgUjgpjFARBfpzp neGg== 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=EcGtGgXguHqjaXXJ36pQryEk21X0HBUHL9rCt/32oUk=; b=AXOVpxAhmWjAQWCpRqdSUjDUrJR+e1IJqSVH96ArnklbnJs8/wfyjiCNsv41/RtdYx om0JSxZJdYFLS6OTCX/mz8rUz3eQ3nMOv+mc3tISyXSJL+VQuFk/PzDadedynMmuWVXK 1Ei6gCMc8V8maMc2x/6J6b8UrSh2i1Fnhx+zbul4FtvtGIVit/iVRHqW7KjMRY6yhOAk q1ZCHyy/ljQhwV4YrXCrQSkBnF7iCaJHc+CXZIv3TyiJ0rb7R/DgswNfHeC8a7omC4Sk 8kybmV2edExxPKDUtXHenExLD9t/J3/LHrq6ZCeVaJu9Ols0BoHAdRgKnNmQrWdaxGp2 bqzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iCTXZ2oc; 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 e25si5489758ejc.74.2019.10.27.14.10.49; Sun, 27 Oct 2019 14:11:12 -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=iCTXZ2oc; 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 S1729067AbfJ0VG4 (ORCPT + 99 others); Sun, 27 Oct 2019 17:06:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:52882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727989AbfJ0VGy (ORCPT ); Sun, 27 Oct 2019 17:06:54 -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 1ED3020873; Sun, 27 Oct 2019 21:06:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210413; bh=Nd/69uza/dlZHrUS8k+TlHCzIFVzAvLu8UefKxT4+6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iCTXZ2ocV6Cob7yF51b+IBI6mq1vcB2PqPmj2VZkrtMJJU3+VZG/3Itf7ZJfxx2KX 1E0xErak8JxnkOtKNmYQtLPJ9vwJph3YPaMJKFh9uHWZaMqHS1f88Zu3nL4eXczmmk XT3ApMWUMgfv2hYuuSSS5uQsJ1XXm8QQIgcWDOZE= 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.9 41/49] parisc: Fix vmap memory leak in ioremap()/iounmap() Date: Sun, 27 Oct 2019 22:01:19 +0100 Message-Id: <20191027203158.986796017@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@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 @@ -2,7 +2,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 */ @@ -83,7 +83,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; } @@ -91,9 +91,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);