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=-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,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 B14F8C33CAF for ; Wed, 22 Jan 2020 09:57:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A81B2467B for ; Wed, 22 Jan 2020 09:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579687044; bh=Ftk3SuAMapPCOEACFpftjFh5YO/lzQfHkme+z3KUgIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kOijheYsLbgWSB+MOZew1FEgy5c4Y5kB2rXyrQN8k8DgMzIrUdFNP5dQgRmq7I8qd Ub6ncSs2aZY94oV4DBwg1F7gBwAIx69H2Qc2Y0fjV3Up62u6ohxgA2ansNBHEtYUxk LJd+biPv7QiWL0cxjWCPJRszfyK+Cfo49GTfjOT0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729413AbgAVJax (ORCPT ); Wed, 22 Jan 2020 04:30:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:42492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729367AbgAVJat (ORCPT ); Wed, 22 Jan 2020 04:30:49 -0500 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 393922071E; Wed, 22 Jan 2020 09:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685448; bh=Ftk3SuAMapPCOEACFpftjFh5YO/lzQfHkme+z3KUgIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUX1WnS3FOQovY1TSB/3V1IAwBBTfXJS1dyPnTIdIAxLVNkGu6SPcs9HRYOKfpiAe 0Lo6oCdVUWN0K42q4gbC3KkioAcScdApF6JcZSimKZ9PQp2H4NKZHpjip5XyAS3dOf HwDbzo9aPbNpBUC6gurmKJMSG9nnCKvF3WANHlpw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jon Derrick , Lu Baolu , Joerg Roedel Subject: [PATCH 4.4 19/76] iommu: Remove device link to group on failure Date: Wed, 22 Jan 2020 10:28:35 +0100 Message-Id: <20200122092753.557127612@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092751.587775548@linuxfoundation.org> References: <20200122092751.587775548@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: Jon Derrick commit 7d4e6ccd1fb09dbfbc49746ca82bd5c25ad4bfe4 upstream. This adds the missing teardown step that removes the device link from the group when the device addition fails. Signed-off-by: Jon Derrick Fixes: 797a8b4d768c5 ("iommu: Handle default domain attach failure") Reviewed-by: Lu Baolu Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/iommu.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -447,6 +447,7 @@ err_put_group: mutex_unlock(&group->mutex); dev->iommu_group = NULL; kobject_put(group->devices_kobj); + sysfs_remove_link(group->devices_kobj, device->name); err_free_name: kfree(device->name); err_remove_link: