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 A60D7C433DF for ; Mon, 1 Jun 2020 18:11:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A367206E2 for ; Mon, 1 Jun 2020 18:11:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035074; bh=QrrXMRRBJoj5LvQo5PKvhynnLM2/nBp79vS5vFCcUbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=buVTOrgg9lnoUDqBBaptGkMVZzVdxfA9XG2UBf7L/PL1KKVKOhSyerJLw5PsbE6GF AbhlqBgCLjFIfqdHAbNNN5Z3rry52h1eMz5F6TjhDevq5+tTRJth1NEolkidScjxto 2vtmdkezqedsL6KhYWz7sscxIcllSBM0FrwKG6nw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731082AbgFASLN (ORCPT ); Mon, 1 Jun 2020 14:11:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:57948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731039AbgFASK4 (ORCPT ); Mon, 1 Jun 2020 14:10:56 -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 2832320825; Mon, 1 Jun 2020 18:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035055; bh=QrrXMRRBJoj5LvQo5PKvhynnLM2/nBp79vS5vFCcUbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=igZRWJb+W/OpbLr1S80FbEYaOhobGnCDvhRikdelaSZXG/hwbCPtdL1NzQDgKhIyX fvo7xmfXywgTOOAKO1HCkku7rhS1Tn6K8G3obJwR7s0UPc3t2t3/+j4EjU/Hwq9YJt +muAyapy/mr/zgt8c257+BM8HI/lgDOqbwZfClVc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiushi Wu , Joerg Roedel , Sasha Levin Subject: [PATCH 5.4 105/142] iommu: Fix reference count leak in iommu_group_alloc. Date: Mon, 1 Jun 2020 19:54:23 +0200 Message-Id: <20200601174048.846732892@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@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: Qiushi Wu [ Upstream commit 7cc31613734c4870ae32f5265d576ef296621343 ] kobject_init_and_add() takes reference even when it fails. Thus, when kobject_init_and_add() returns an error, kobject_put() must be called to properly clean up the kobject. Fixes: d72e31c93746 ("iommu: IOMMU Groups") Signed-off-by: Qiushi Wu Link: https://lore.kernel.org/r/20200527210020.6522-1-wu000273@umn.edu Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index cd3c0ea56657..9d7232e26ecf 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -492,7 +492,7 @@ struct iommu_group *iommu_group_alloc(void) NULL, "%d", group->id); if (ret) { ida_simple_remove(&iommu_group_ida, group->id); - kfree(group); + kobject_put(&group->kobj); return ERR_PTR(ret); } -- 2.25.1