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=-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,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 45088C2D0DB for ; Fri, 24 Jan 2020 11:20:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DA4E2075D for ; Fri, 24 Jan 2020 11:20:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864807; bh=qN6/tn9x5rqsc+6CMzv6hWs9jcJj25g4spa0oz31JU0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OvHoP+pGIMzAheBNBqktJKenX3wpdHlbJSJIXg+/68u7SJSWqgXIHfFZq0wD1g+RT v5WRWZUk18eG8HGMvc2t27PhEZl9TW0XhggcG8oWhvddwKqfvTt1rl2/2HDxCkrW/V gP473k7vuRwPu18UTxcsHtANx2BdnqY+fc3EitAs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390662AbgAXLUE (ORCPT ); Fri, 24 Jan 2020 06:20:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:57462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390861AbgAXLUB (ORCPT ); Fri, 24 Jan 2020 06:20:01 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 2FA3C20708; Fri, 24 Jan 2020 11:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864800; bh=qN6/tn9x5rqsc+6CMzv6hWs9jcJj25g4spa0oz31JU0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RV98Z3FBDrjXBuahc7gNlYBkxttuIZva5MIYWVRaip+8Fi23a65TRzXioIMFRBTer Dhbf19anreZzaG6b/6A81yRHhtqFpOduGipXwREMyuZpq6HbYEiruTQG8/dKewpfOf y/spXX/a1SbFToL7Hdv8vbHSxMjrtRJVbb57rYMQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cornelia Huck , Maxim Levitsky , Parav Pandit , Alex Williamson , Sasha Levin Subject: [PATCH 4.19 356/639] vfio/mdev: Follow correct remove sequence Date: Fri, 24 Jan 2020 10:28:46 +0100 Message-Id: <20200124093131.697858508@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: 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 249472f055097..e7770b511d033 100644 --- a/drivers/vfio/mdev/mdev_sysfs.c +++ b/drivers/vfio/mdev/mdev_sysfs.c @@ -280,7 +280,7 @@ type_link_failed: 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