From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFA27C76186 for ; Wed, 24 Jul 2019 19:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 969AE20665 for ; Wed, 24 Jul 2019 19:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997722; bh=k1xDp3QKIhVdI9UdTMEmjwYOIP+L6j5Yzp1qNTggtSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sftBoxZ+mKUDAMtnWBSpiYT4+2iRO9O5swPk9J9uupdEZX58KESedM9L438aJrW5D acfu+cRTQmqJP9fUrcSFXiuBtm9BemwI3k5JPHwXQEYu9htb5VPrOY0GTxdILDljMi tJmDpBilOPMyRYt9yqbcy5y1rCySJljhcyb8qXcU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403787AbfGXTsl (ORCPT ); Wed, 24 Jul 2019 15:48:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:56102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391440AbfGXTsj (ORCPT ); Wed, 24 Jul 2019 15:48:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0C499205C9; Wed, 24 Jul 2019 19:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997718; bh=k1xDp3QKIhVdI9UdTMEmjwYOIP+L6j5Yzp1qNTggtSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=abTAxBlyF3jOgki/W4vTuvdzJ9UPV/MCjtIVZKInA44UcUUZ33OtCCVKyjSWROgyC R1l21TQMk63IfG8y16ozVVMwwPsJo0mDOxxpe9TYy6u+I+DjuVHj+tXsX/6rWoOEbz 1HOSR+nkI59c42O1IBkE0csI8ZwSMpy2hS9kPr28= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Auger , Joerg Roedel , Sasha Levin Subject: [PATCH 5.1 079/371] iommu: Fix a leak in iommu_insert_resv_region Date: Wed, 24 Jul 2019 21:17:11 +0200 Message-Id: <20190724191730.803923167@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@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 [ Upstream commit ad0834dedaa15c3a176f783c0373f836e44b4700 ] In case we expand an existing region, we unlink this latter and insert the larger one. In that case we should free the original region after the insertion. Also we can immediately return. Fixes: 6c65fb318e8b ("iommu: iommu_get_group_resv_regions") Signed-off-by: Eric Auger Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/iommu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 109de67d5d72..2d06c507fbed 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -241,18 +241,21 @@ static int iommu_insert_resv_region(struct iommu_resv_region *new, pos = pos->next; } else if ((start >= a) && (end <= b)) { if (new->type == type) - goto done; + return 0; else pos = pos->next; } else { if (new->type == type) { phys_addr_t new_start = min(a, start); phys_addr_t new_end = max(b, end); + int ret; list_del(&entry->list); entry->start = new_start; entry->length = new_end - new_start + 1; - iommu_insert_resv_region(entry, regions); + ret = iommu_insert_resv_region(entry, regions); + kfree(entry); + return ret; } else { pos = pos->next; } @@ -265,7 +268,6 @@ static int iommu_insert_resv_region(struct iommu_resv_region *new, return -ENOMEM; list_add_tail(®ion->list, pos); -done: return 0; } -- 2.20.1