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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 5BA70C7618F for ; Mon, 15 Jul 2019 13:52:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29D942081C for ; Mon, 15 Jul 2019 13:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198736; bh=nDZdbixBXIx9MGYuBGqyJi/MTPT1ELD4NK7jIRK7JPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2E1l8nPJduJLHRCAtG2RGSW7n/Y+A9DnnTje6CJiy+J/0xNj8hCuxQ55Ipxghi5RS 6zrIsxip5cleYMHm1asoAplYtKUIlQdfA39d3yrlwSWEeNuDmL+xCUHQc2b5zZI98o hrrKr8uo47iicIVAOpmgpvgi/nof/7FJOlGaWFkQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731709AbfGONvx (ORCPT ); Mon, 15 Jul 2019 09:51:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:44008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731332AbfGONvw (ORCPT ); Mon, 15 Jul 2019 09:51:52 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A4A4421537; Mon, 15 Jul 2019 13:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198711; bh=nDZdbixBXIx9MGYuBGqyJi/MTPT1ELD4NK7jIRK7JPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uCnJpXCefNymGil9DBcyxVTNERoKsoJoHV24dHlXh2kZS3+3P01fPVHM4BhLfoTVQ 9S4aUxvuEX/gv0ar/8hwoCqXn4G7TGCgP93V6nD5RSjgtG1aLnHqQJm159ji0jp1ir d0Q7Vsh7nbZWcZX5AbkeoIb37oKgh5OQ1Z0kRNow= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Auger , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.2 089/249] iommu: Fix a leak in iommu_insert_resv_region Date: Mon, 15 Jul 2019 09:44:14 -0400 Message-Id: <20190715134655.4076-89-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Auger [ 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 9f0a2844371c..30db41e9f15c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -225,18 +225,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; } @@ -249,7 +252,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