diff mbox series

[4.9,21/97] iommu: Remove device link to group on failure

Message ID	20200122092759.508263520@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=TRKd=3L=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Jon Derrick <jonathan.derrick@intel.com>, Lu Baolu <baolu.lu@linux.intel.com>, Joerg Roedel <jroedel@suse.de> Subject: [PATCH 4.9 21/97] iommu: Remove device link to group on failure Date: Wed, 22 Jan 2020 10:28:25 +0100 Message-Id: <20200122092759.508263520@linuxfoundation.org> In-Reply-To: <20200122092755.678349497@linuxfoundation.org> References: <20200122092755.678349497@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,04/97] ethtool: reduce stack usage with clang [4.9,06/97] rsi: add fix for crash during assertions [4.9,09/97] arm64: mm: Change page table pointer name in p[md]_set_huge() [4.9,11/97] arm64: Make sure permission updates happen for pmd/pud [4.9,12/97] cfg80211/mac80211: make ieee80211_send_layer2_update a public function [4.9,13/97] mac80211: Do not send Layer 2 Update frame before authorization [4.9,14/97] media: usb:zr364xx:Fix KASAN:null-ptr-deref Read in zr364xx_vidioc_querycap [4.9,15/97] wimax: i2400: fix memory leak [4.9,16/97] wimax: i2400: Fix memory leak in i2400m_op_rfkill_sw_toggle [4.9,17/97] ext4: fix use-after-free race with debug_want_extra_isize [4.9,19/97] dccp: Fix memleak in __feat_register_sp [4.9,21/97] iommu: Remove device link to group on failure [4.9,23/97] hsr: reset network header when supervision frame is created [4.9,27/97] scsi: sd: Clear sdkp->protection_type if disk is reformatted without PI [4.9,28/97] platform/x86: asus-wmi: Fix keyboard brightness cannot be set to 0 [4.9,30/97] mei: fix modalias documentation [4.9,34/97] powerpc/powernv: Disable native PCIe port management [4.9,35/97] tty: serial: imx: use the sg count from dma_map_sg [4.9,37/97] media: exynos4-is: Fix recursive locking in isp_video_release() [4.9,38/97] mtd: spi-nor: fix silent truncation in spi_nor_read() [4.9,41/97] f2fs: fix potential overflow [4.9,43/97] gpio: mpc8xxx: Add platform device to gpiochip->parent [4.9,45/97] rseq/selftests: Turn off timeout setting [4.9,47/97] ioat: ioat_alloc_ring() failure handling. [4.9,50/97] ocfs2: call journal flush to mark journal as empty after journal recovery when mount [4.9,52/97] clk: Dont try to enable critical clocks if prepare failed [4.9,55/97] block: fix an integer overflow in logical block size [4.9,56/97] iio: buffer: align the size of scan bytes to size of the largest element [4.9,57/97] USB: serial: simple: Add Motorola Solutions TETRA MTP3xxx and MTP85xx [4.9,60/97] USB: serial: ch341: handle unbound port at reset_resume [4.9,61/97] USB: serial: io_edgeport: add missing active-port sanity check [4.9,62/97] USB: serial: quatech2: handle unbound ports [4.9,65/97] x86/efistub: Disable paging at mixed mode entry [4.9,68/97] mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio() [4.9,70/97] net: stmmac: Enable 16KB buffer size [4.9,72/97] USB: serial: io_edgeport: handle unbound ports on URB completion [4.9,74/97] scsi: fnic: use kernels %pM format option to print MAC [4.9,76/97] arm64: dts: agilex/stratix10: fix pmu interrupt numbers [4.9,78/97] netfilter: fix a use-after-free in mtype_destroy() [4.9,80/97] batman-adv: Fix DAT candidate selection on little endian systems [4.9,81/97] macvlan: use skb_reset_mac_header() in macvlan_queue_xmit() [4.9,83/97] net/wan/fsl_ucc_hdlc: fix out of bounds write on array utdm_info [4.9,86/97] net: usb: lan78xx: limit size of local TSO packets [4.9,87/97] xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk [4.9,89/97] cfg80211: check for set_wiphy_params [4.9,91/97] scsi: esas2r: unlock on error in esas2r_nvram_read_direct() [4.9,92/97] scsi: qla4xxx: fix double free bug [4.9,95/97] scsi: core: scsi_trace: Use get_unaligned_be*()

Commit Message

Greg KH Jan. 22, 2020, 9:28 a.m. UTC

From: Jon Derrick <jonathan.derrick@intel.com>

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 <jonathan.derrick@intel.com>
Fixes: 797a8b4d768c5 ("iommu: Handle default domain attach failure")
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/iommu/iommu.c |    1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -439,6 +439,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: