Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754316AbcL3Wkn (ORCPT ); Fri, 30 Dec 2016 17:40:43 -0500 Received: from mail.ispras.ru ([83.149.199.45]:46376 "EHLO mail.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754028AbcL3Wkm (ORCPT ); Fri, 30 Dec 2016 17:40:42 -0500 From: Alexey Khoroshilov To: Kirti Wankhede , Neo Jia Cc: Alexey Khoroshilov , Alex Williamson , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH] samples/vfio-mdev: don't return zero on failure paths in mtty_dev_init() Date: Sat, 31 Dec 2016 01:40:29 +0300 Message-Id: <1483137629-18500-1-git-send-email-khoroshilov@ispras.ru> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1398 Lines: 48 If class_create() or mdev_register_device() fail, mtty_dev_init() breaks off initialization, deallocates all resources, but returns zero. The patch adds proper error code return values. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov --- samples/vfio-mdev/mtty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/vfio-mdev/mtty.c b/samples/vfio-mdev/mtty.c index 6b633a4ea333..e9c52e1f97a6 100644 --- a/samples/vfio-mdev/mtty.c +++ b/samples/vfio-mdev/mtty.c @@ -1446,6 +1446,7 @@ static int __init mtty_dev_init(void) mtty_dev.vd_class = class_create(THIS_MODULE, MTTY_CLASS_NAME); if (IS_ERR(mtty_dev.vd_class)) { + ret = PTR_ERR(mtty_dev.vd_class); pr_err("Error: failed to register mtty_dev class\n"); goto failed1; } @@ -1458,7 +1459,8 @@ static int __init mtty_dev_init(void) if (ret) goto failed2; - if (mdev_register_device(&mtty_dev.dev, &mdev_fops) != 0) + ret = mdev_register_device(&mtty_dev.dev, &mdev_fops); + if (ret) goto failed3; mutex_init(&mdev_list_lock); @@ -1467,11 +1469,9 @@ static int __init mtty_dev_init(void) goto all_done; failed3: - device_unregister(&mtty_dev.dev); failed2: class_destroy(mtty_dev.vd_class); - failed1: cdev_del(&mtty_dev.vd_cdev); unregister_chrdev_region(mtty_dev.vd_devt, MINORMASK); -- 2.7.4