From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755585AbcHXN5E (ORCPT ); Wed, 24 Aug 2016 09:57:04 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:54066 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753057AbcHXN5D (ORCPT ); Wed, 24 Aug 2016 09:57:03 -0400 From: Alban Bedel To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Javier Martinez Canillas , Sakari Ailus , linux-kernel@vger.kernel.org, Alban Bedel Subject: [PATCH v2] [media] v4l2-async: Always unregister the subdev on failure Date: Wed, 24 Aug 2016 15:49:48 +0200 Message-Id: <20160824134948.21607-1-alban.bedel@avionic-design.de> X-Mailer: git-send-email 2.9.3 X-Provags-ID: V03:K0:t9vAWh3CpxYtgO3i/kyYb6Dgl1sywMmMWnQnfRNnSIJx80uA9yX IY1K+8gjYCGjTXTWXJKJik4kISNFNhs4HEUXChQU7iFNIbatGGPIwxGPXGWPGVE6a0n0spw wPWpYdGOLsEKaZOqC7UkzaEZF7UongtxncnwX3WJjfd1kNppDkNq77qVZwLRwCVZ5f6Qrdo aqahD+AUbT820pEYI4TVQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:KyTQsJE+X8Q=:0g3nE5ewy3mETil4hRP3Oj YehqlgOxyZFAfichTAKjMAT51+UCMgNlv1ZDMK5EvCyqG9NVo1PYXweUc3wJkSjvwykFa5g5p 3qEZWbb0E3tHOx1ZNM9jNHsARqhfXiWTkikj+KiLKuGl/HM+GLAgwdAa4FD1FAmIRXtmqffuc jp9aNUupowW4k8EWQtGFQBC9g4Ks2A948vJCXaH/T+bQiLAlcLKraeRLS052PDLkvuO8wX+eB qYZeiDsXu3K8eNw8WUHjHp4ksuupwQcosj0Vy3l0dhtGVMGyNPPN/at/J246KRTpUx3bRuSyj L1XssD2xYH8WCyJSLUvb/ZJm21AspuXxKVVJGq+Duh4NKGMq+0Qx93qO1CmN/rlAYfVeU+XfA 3K9amnsSdR3bNJnXNF2RabkzJnNpugxubE/9i96W85LiBf8gXv+Q2xbhdIsUtp8jx7d+FB6Bm 8PdNIesBxQeQSOeO8H/Et12zqp4LZ2c0/vVfPmvc2GG8/voK7ZKewO3y9XRPAm5tpAsRxHALt GVW6P/tnsHPqgB9j2MyFf1RVU/PJKwR916vleFVEudUMNi66st04RQD2RGJNVFcdItwp+JQI7 s4avRS+2dokZKhMgVxQIgO/eC8lZTcQsNyu5xvj426nHeCasTXJ016gEUdiugGl2zT/BzCQJK H/7uHPtpezqKugei/4f0n33lGtf83SdkI/Bx+jhG1A0YAW66OkvSlgA+QP/KyIrl1doU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In v4l2_async_test_notify() if the registered_async callback or the complete notifier returns an error the subdev is not unregistered. This leave paths where v4l2_async_register_subdev() can fail but leave the subdev still registered. Add the required calls to v4l2_device_unregister_subdev() to plug these holes. Signed-off-by: Alban Bedel --- Changelog: v2: * Added the missing unbind() calls as suggested by Javier. --- drivers/media/v4l2-core/v4l2-async.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index ceb28d47c3f9..abe512d0b4cb 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -113,23 +113,28 @@ static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier, list_move(&sd->async_list, ¬ifier->done); ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd); - if (ret < 0) { - if (notifier->unbind) - notifier->unbind(notifier, sd, asd); - return ret; - } + if (ret < 0) + goto err_subdev_register; ret = v4l2_subdev_call(sd, core, registered_async); - if (ret < 0 && ret != -ENOIOCTLCMD) { - if (notifier->unbind) - notifier->unbind(notifier, sd, asd); - return ret; + if (ret < 0 && ret != -ENOIOCTLCMD) + goto err_subdev_call; + + if (list_empty(¬ifier->waiting) && notifier->complete) { + ret = notifier->complete(notifier); + if (ret < 0) + goto err_subdev_call; } - if (list_empty(¬ifier->waiting) && notifier->complete) - return notifier->complete(notifier); - return 0; + +err_subdev_call: + v4l2_device_unregister_subdev(sd); +err_subdev_register: + if (notifier->unbind) + notifier->unbind(notifier, sd, asd); + + return ret; } static void v4l2_async_cleanup(struct v4l2_subdev *sd) -- 2.9.3