Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wan Jiabing <wanjiabing@vivo.com>
To:     Paolo Bonzini <pbonzini@redhat.com>,
        Alex Williamson <alex.williamson@redhat.com>,
        Yi Liu <yi.l.liu@intel.com>, Kevin Tian <kevin.tian@intel.com>,
        Jason Gunthorpe <jgg@ziepe.ca>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Wan Jiabing <wanjiabing@vivo.com>
Subject: [PATCH] kvm/vfio: Fix potential deadlock problem in vfio
Date:   Tue, 17 May 2022 10:34:41 +0800
Message-Id: <20220517023441.4258-1-wanjiabing@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0Qx+e1kGuwsokmvN+WDaacX22Gp9GUeOG0AiiJrnUaT+DbBnHOOp70zN6/bz?=
 =?us-ascii?Q?naw002PFHCAklHxs9C/ugs9HQLxo8vLWD54CfR7K7efX+MfO6EsGYrZtN6I7?=
 =?us-ascii?Q?jnQppKJLLX7OohPuJ6znuWPuumzZQagxY8rUjiI0qDh3meBP490klVmN6pZr?=
 =?us-ascii?Q?IsInh+HXbsWkBEcB4g8xnffYHrsCGG/1gBoftdcZ6vcyq9Bfl9wSRFvWrXl/?=
 =?us-ascii?Q?RuHtAk8uddRL0eB6QzsP7bzi+hVRlld/if8eXAk6FM7o9zjAnfX0HzdBCERb?=
 =?us-ascii?Q?kw83noDlJy/FfR73+AnlfwWCxcYJlk3wxmgRggCfwXdIZR073hU8W7glbYvj?=
 =?us-ascii?Q?kjCpG7LWr6akfRvB4umllgLqAXd0ycqC/DOu72y+X26EgYp6+gkWmxj2NV8e?=
 =?us-ascii?Q?pl4jyHtrlnQBfHSst8bVms9EhQvUY5DZnS9j8syan4sISQT2ArQyzoKgrTQG?=
 =?us-ascii?Q?PQfoh6IVme8vQvhTwQKAO5rWpj5JuFX1vnpae5lnygUB5vNvRk2Jsv1GN29r?=
 =?us-ascii?Q?yBx+gIOCAB9zU6MZByWt6oU/sS8DUd/1AAEGY5xg9MizdMjQ4kqSdK7K0O1S?=
 =?us-ascii?Q?aq0aGch3qojAueWiZ/EZRnl2Ahx72qdVh9uZi9Tzu90axzbG6tIJx8o9PVNx?=
 =?us-ascii?Q?qar3+FwYl7xYCdcgZnI5SnqgRSz+qLvqIY9oXXvgFoBSXaKpzrZY9Vy7Wor5?=
 =?us-ascii?Q?MFix2ItATDhM0KSs/tX35/PGZlMpqZp4Pkn3Afqgu/vkecuf3t7jUxbrxHei?=
 =?us-ascii?Q?1pnSERoEwIygEAFgVjIgRrenzwIuL36qFPzReovURskJTBlcAhUUx79Ly2y9?=
 =?us-ascii?Q?PrRTFxU2lBkA1L6cS0W3beI1L3gjPMIv5OQiXOa7CP4vFkJPGBVwPRXyojsm?=
 =?us-ascii?Q?hwIAsCKyBcJoj6eFmHE+lB6rEF83ThKilRLUCf0xYIOVt49PaRnpljLCaD+M?=
 =?us-ascii?Q?1qrmJL5yuOa4nLn4wkXKuNB1vekabUt/vg5pha0JwreA+sW72NVR/VykLSq2?=
 =?us-ascii?Q?mytkx3Yo0VQWcjpsN1uHzsBVXsGRS9RUtEG36UPwb/XI0zwJMQ/VuQ0cmbUK?=
 =?us-ascii?Q?kWBAhJnIrHZoO0tEAw/gbelGCtO/FQp1B2U6cMHDz/Vxh4fKzYktpCsLUPdp?=
 =?us-ascii?Q?wwxFEnCxgIjk/VC/UexiK7pAAB2nczlHuPiMx9oEeLntIOTW+dnMvpKOueDE?=
 =?us-ascii?Q?JZo1wIinJ+DMGWn9ERYIDHWjvpoe0ZVGlQXATLanKrvFczFV+IL1IsyOVQOc?=
 =?us-ascii?Q?JvlsP2tEWpJRqyqfnlx/W2nHke7ueGT6k+60+RrjTE2HW0jvwSMmgElpYB25?=
 =?us-ascii?Q?J2PZEV+TP4mpyeyXbPRmUDYGrljWMJ7iYFk500oTt8XW4Mg0M6Mcsg6XEEu+?=
 =?us-ascii?Q?Rm+FqSHiwTptSN4jBzd/gxB0gcxsYiuQtmTHedgKLJy6AHycahmBROIDQbEa?=
 =?us-ascii?Q?iGVWgHSnlt95gcVBtzPULwGjRkh075YEYte+FyqoGFkTrR2+EJoy3j0T5y20?=
 =?us-ascii?Q?2qGvYRpYRFuBlhL/xpk5YxvEa7MayqFOrcxUzJoOJVDrBYy1W61eWiEO9F3F?=
 =?us-ascii?Q?TtBnOPtH06Otrg6aQkZiMgYtekk7ydXJP2g77rppmMQQgR+mI6BNRaWW1uUf?=
 =?us-ascii?Q?zCgzRvl42rzhbBE4xiIzMwhfsOLSugU4ERlKFC/WDilMtVGNAcO4e3beX6C9?=
 =?us-ascii?Q?BdXQx/KHNYX+iLVNaySHOFTeWAcxsmoCjp4N9jjWCVH3o6mHxwMKSpm6TKmH?=
 =?us-ascii?Q?qe7MUGSBEQ=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d759f6cf-2a75-4ddb-5b99-08da37add415
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3367.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 02:34:55.7135
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: G7N3YJBaUD64SlKjNJX3fbg46etrK2vuLrfT41LN95HoicN4LJFgjC8ZMNoxrISZ73igZoN3LLY1LFHa2G2Gmg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK0PR06MB2484
X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Fix following coccicheck warning:
./virt/kvm/vfio.c:258:1-7: preceding lock on line 236

If kvm_vfio_file_iommu_group() failed, code would goto err_fdput with
mutex_lock acquired and then return ret. It might cause potential
deadlock. Move mutex_unlock bellow err_fdput tag to fix it. 

Fixes: d55d9e7a45721 ("kvm/vfio: Store the struct file in the kvm_vfio_group")
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 virt/kvm/vfio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c
index 8f9f7fffb96a..ce1b01d02c51 100644
--- a/virt/kvm/vfio.c
+++ b/virt/kvm/vfio.c
@@ -252,8 +252,8 @@ static int kvm_vfio_group_set_spapr_tce(struct kvm_device *dev,
 		break;
 	}
 
-	mutex_unlock(&kv->lock);
 err_fdput:
+	mutex_unlock(&kv->lock);
 	fdput(f);
 	return ret;
 }
-- 
2.36.1