From patchwork Mon Jun 1 17:53:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 225128 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 F22A3C433E0 for ; Mon, 1 Jun 2020 17:58:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D57AC2077D for ; Mon, 1 Jun 2020 17:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034331; bh=H9HKOb5hlPICO/Ao4mgediwtfvQ/lbpga1cROabH/L0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t4ysrhs2jwE36He6ChVV6N/1Nu7OyIu6MpRs+Z2v4xWJpN+EDbJN06YPJRkqlo4jW l9DpA3DaWkd1WVF+FG8V7yCoRYSKsrZTKpN5FEMWUmPwfZIX9iCKFvtxipYYXOPeBj u55d50jVm9Jgc3kUbDhJqe1mVrnLND6q8Cn4iyoY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728521AbgFAR6u (ORCPT ); Mon, 1 Jun 2020 13:58:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:40922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728479AbgFAR6r (ORCPT ); Mon, 1 Jun 2020 13:58:47 -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 771A22073B; Mon, 1 Jun 2020 17:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034326; bh=H9HKOb5hlPICO/Ao4mgediwtfvQ/lbpga1cROabH/L0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fU+HrLfazSmjeOGHOHorD+UZi9iHp3IzS9zAFqpAD+7TnBl217m48pd+lc9ICih0d oqp5pSNyPB5mPeXXwKxsliNxjCyarls8VxomMV8+1kJFzsWOrKenhu7H+/6egEFPaW aT/kxKOaYoc8ahTvbydp+CftCokKHwpC9sfiU3R8= 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 4.9 41/61] iommu: Fix reference count leak in iommu_group_alloc. Date: Mon, 1 Jun 2020 19:53:48 +0200 Message-Id: <20200601174019.243904766@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174010.316778377@linuxfoundation.org> References: <20200601174010.316778377@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(-) --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -195,7 +195,7 @@ struct iommu_group *iommu_group_alloc(vo NULL, "%d", group->id); if (ret) { ida_simple_remove(&iommu_group_ida, group->id); - kfree(group); + kobject_put(&group->kobj); return ERR_PTR(ret); }