From patchwork Mon Jun 1 17:54:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 225015 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=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 514A9C433E1 for ; Mon, 1 Jun 2020 18:19:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A3D02073B for ; Mon, 1 Jun 2020 18:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035598; bh=yQ1RpDPOpLstknoCjJfMikrQnCZVMMghEBT+a9gUySk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O34ZPdL/6afbfxf0h0uYfyA/1+FBx0CPUdj/dFPElWlEr7Dv1DiLKNRytVixYiIsg Oq5fcn2ON5n6jAMycw1euUk36HPJ9e3ZdX7s6xY8gccc2CephzxvxPumL3/VbJsYyJ Pibwr6JuKtYYn7ylPDW4fKyy50KSD/EPCBdRGSUg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730048AbgFASQa (ORCPT ); Mon, 1 Jun 2020 14:16:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:37194 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731712AbgFASQ3 (ORCPT ); Mon, 1 Jun 2020 14:16:29 -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 E2ABA2065C; Mon, 1 Jun 2020 18:16:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035388; bh=yQ1RpDPOpLstknoCjJfMikrQnCZVMMghEBT+a9gUySk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=woE5sjGTePacB5uw2UxGoe0CchGXPSrlRVyMxp1jAuMVxdsIDLmCP5lBtr8Uvu60w VJJ7J2sTlV1NBCFM9xHdIC0Kbpc+NymoQ4uVYeQ87Ymp5l/rF8M5UTsUjcCn4ZEEM7 xSuxaHsF/f0jFIp0R5isZEvayKzhvPT6tqiwgERI= 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.6 138/177] iommu: Fix reference count leak in iommu_group_alloc. Date: Mon, 1 Jun 2020 19:54:36 +0200 Message-Id: <20200601174059.904735525@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174048.468952319@linuxfoundation.org> References: <20200601174048.468952319@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 22b28076d48e..b09de25df02e 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -509,7 +509,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); }