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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 53297C33CAF for ; Thu, 16 Jan 2020 18:57:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29202206D7 for ; Thu, 16 Jan 2020 18:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579201049; bh=ejParNsJ56fjcfXOgWDWrFKVG86hj6ZpirAQCtsnHiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iry2IZkvxjgqA7YMTQbUAyXsIe8nkcdXfzhxdw7kSL+TQ/V2cHnhPwOKUrcW8DDAj C7J1zxb2HDt1yyA4h62epBYPkwPIkUG5cIlbawiYd97opk6kMIdUZKrE6lUSHCjlwB 14vk2EOAZVZGWasn8pJDNEtGzCkW3cnwad4DiZYI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389065AbgAPRHD (ORCPT ); Thu, 16 Jan 2020 12:07:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:38276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389061AbgAPRHD (ORCPT ); Thu, 16 Jan 2020 12:07:03 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 69DCC22464; Thu, 16 Jan 2020 17:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194422; bh=ejParNsJ56fjcfXOgWDWrFKVG86hj6ZpirAQCtsnHiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FyHeTTegXcug6Nj1rj1T6BBBj6PWOc3r04lrWBIEa7Hw8VqNa0g6umMWM+CgDxwMa vUan9NzThaEckM3LONuOybNZVnWlTOEcYhm03G56vD8XgU12ebCvNO8ybQREdIYtJY HDie7NSWXvZxuHjwIld5CSSa82GmxHd0YwA00yP4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Parav Pandit , Cornelia Huck , Maxim Levitsky , Alex Williamson , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 341/671] vfio/mdev: Follow correct remove sequence Date: Thu, 16 Jan 2020 11:59:39 -0500 Message-Id: <20200116170509.12787-78-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Parav Pandit [ Upstream commit a6d6f4f160f76d840e59affe664b8d3159e23056 ] mdev_remove_sysfs_files() should follow exact mirror sequence of a create, similar to what is followed in error unwinding path of mdev_create_sysfs_files(). Fixes: 6a62c1dfb5c7 ("vfio/mdev: Re-order sysfs attribute creation") Reviewed-by: Cornelia Huck Reviewed-by: Maxim Levitsky Signed-off-by: Parav Pandit Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/mdev/mdev_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vfio/mdev/mdev_sysfs.c b/drivers/vfio/mdev/mdev_sysfs.c index 249472f05509..e7770b511d03 100644 --- a/drivers/vfio/mdev/mdev_sysfs.c +++ b/drivers/vfio/mdev/mdev_sysfs.c @@ -280,7 +280,7 @@ int mdev_create_sysfs_files(struct device *dev, struct mdev_type *type) void mdev_remove_sysfs_files(struct device *dev, struct mdev_type *type) { + sysfs_remove_files(&dev->kobj, mdev_device_attrs); sysfs_remove_link(&dev->kobj, "mdev_type"); sysfs_remove_link(type->devices_kobj, dev_name(dev)); - sysfs_remove_files(&dev->kobj, mdev_device_attrs); } -- 2.20.1