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=-7.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 D79D6ECE562 for ; Mon, 17 Sep 2018 03:16:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B5F8208AE for ; Mon, 17 Sep 2018 03:16:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microsoft.com header.i=@microsoft.com header.b="izm57YCH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B5F8208AE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731166AbeIQIlz (ORCPT ); Mon, 17 Sep 2018 04:41:55 -0400 Received: from mail-eopbgr690134.outbound.protection.outlook.com ([40.107.69.134]:52946 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729674AbeIQIbM (ORCPT ); Mon, 17 Sep 2018 04:31:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m3z8QoYp0fTPmEDFpQ2ZY/DfCG5PNul1QKts4mtY+Nk=; b=izm57YCHoFaNfysgVPL0GnwuircQAtdV1KxZPziBIhzwZm2/6DHteX/ftTgU+fBoTCRmfx/+VDManiBCJby7X94n0Auq/YXWYy/vA3z9w2NDnEiYx/cldlfjSf11f4dRAADUUDXpoH30v+qhIXPXjFnCJyiZCRGA1HO6FHMrtz0= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0120.namprd21.prod.outlook.com (10.173.189.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.4; Mon, 17 Sep 2018 03:05:42 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1185.003; Mon, 17 Sep 2018 03:05:42 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Alexey Khoroshilov , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH AUTOSEL 4.9 19/57] media: fsl-viu: fix error handling in viu_of_probe() Thread-Topic: [PATCH AUTOSEL 4.9 19/57] media: fsl-viu: fix error handling in viu_of_probe() Thread-Index: AQHUTjMRsC5tH/HSnEWjCSDw7/vjKw== Date: Mon, 17 Sep 2018 03:03:55 +0000 Message-ID: <20180917030340.378-19-alexander.levin@microsoft.com> References: <20180917030340.378-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030340.378-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY4PR21MB0120;6:07YHN+mAtcy6RM0u4UhO6jpjkFcqjQ1UtQTAulnDpjq0J26i4g9Dqg/RJbyUwRW+hkhcB+1lhMXt3IavtAPEF0rzhCq+6pHq2J28uO4jVtCuAv8PvDi37n+9IAhNptZbl69wcKQ1lx9zdA68pdgGkvFYl5h691derEDfsYe1yXEtmiDNj5+sVA4qRaLGGi/jF41qmQW/zsV57YCwXCnIOK+mzKgvgzzYWQBAQWrUTaefoAlHUYJeuctaprxU60NTQV1Xik5OntQYLzwFJV47mVFw55BExTYVe3OEULF0/U7TlAhab5zOWljXH/Bne5kNzwAxU+0XUzgU9LiqZoCAD0QSubHCL7M7PFry2I9WylkF9eFxh29xPu/GJBIblulwRBE8XdeTp5kodM8ApRQIzDJdmmRYdLFF3H93Do+ijITQgO1tKL/u6hoaT+C5XBVxIE+Jf6AxwIHzuXmQOcnAhA==;5:tyTMqWbN7x4cCJOb2NyCIANgIsfRUQeUvti2umc61U0/CpRYq2hnCh2gTmCVbgFINH8S8hKVUcr9mj81J/B63Yje7iZrbPwf7pSSp0FX0OEjCL1HriQm3QSfiE+1hJyYkPRQMwwS8CqjKc7b7nWV/qjVG8XP2gRf4Qm1c5Pcbxs=;7:Fs+W7Tpy3gUNTuqwMcehkxKJTFW1JxrZ5HgevUk0Zl4r0/E+bJ8nC7t8UXBfZLhXTPzQS61up40qRQFl6vij1iUQUm6Xi+Y8OLaS080VrtSIbkqazCMj53zKYAEJWVO0Kw/UWsxnkcqWG6ocgT+yVpJhxhntprhFlbQRFn+wQmmk/74ZmCzCWbvxXjqEpgoKXBGd7w07Vz3N7Ra1/QRGGm0MyBWyrk7fqFGhbuqp6mduMRl7kkfeqzktZagSChl/ x-ms-office365-filtering-correlation-id: 2ec54ff5-18fb-44ab-a08c-08d61c4a7429 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:CY4PR21MB0120; x-ms-traffictypediagnostic: CY4PR21MB0120: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(95692535739014)(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(2018427008)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050)(76991041);SRVR:CY4PR21MB0120;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0120; x-forefront-prvs: 0798146F16 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(54906003)(26005)(110136005)(446003)(2906002)(6346003)(99286004)(316002)(575784001)(86362001)(25786009)(102836004)(10090500001)(2616005)(2900100001)(76176011)(97736004)(36756003)(11346002)(72206003)(478600001)(10290500003)(3846002)(6116002)(1076002)(22452003)(107886003)(5250100002)(2501003)(86612001)(4326008)(217873002)(105586002)(106356001)(6486002)(14444005)(14454004)(256004)(6436002)(8676002)(305945005)(8936002)(6506007)(81156014)(81166006)(7736002)(476003)(486006)(68736007)(186003)(66066001)(6512007)(4477795004)(53936002)(5660300001)(6666003);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0120;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: XVaKA6BxdJ+RTO/rZ2Pg1c+8T9g7lPdhosvr2BTlYtsoVVCIze48tUSnffnt8dnSVvIN+/6OoQ4dyyw7+bFin6OlXIobD/hdQQnE8ZMcfYXR0ebrQ4l9y7rdYWFFgymyFpqQUba2QR321abPJHQq2QXDtBU/bXN/N3e+1DIYf/JYSw5nrPzXF1xXBahEkUOeTHENscCX9tMb/+6wq2yUpIMNja0dXH3FsvCm8J30qDWgz6UScTmXoxHygJJlD1poKLf5azNC40IiZ7/LSSG21qMBzVHGmOrm0VlMO8xxRimmn+6MTFrLiGS9slkQhpbe3x+ZsElG/xwTR/GcxZbm19TD/y1Cs9E7uSom8M+8Ilg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ec54ff5-18fb-44ab-a08c-08d61c4a7429 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2018 03:03:55.0710 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0120 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexey Khoroshilov [ Upstream commit 662a99e145661c2b35155cf375044deae9b79896 ] viu_of_probe() ignores fails in i2c_get_adapter(), tries to unlock uninitialized mutex on error path. The patch streamlining the error handling in viu_of_probe(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/fsl-viu.c | 38 +++++++++++++++++++------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-= viu.c index ae8c6b35a357..7f0ed5a26da9 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -1417,7 +1417,7 @@ static int viu_of_probe(struct platform_device *op) sizeof(struct viu_reg), DRV_NAME)) { dev_err(&op->dev, "Error while requesting mem region\n"); ret =3D -EBUSY; - goto err; + goto err_irq; } =20 /* remap registers */ @@ -1425,7 +1425,7 @@ static int viu_of_probe(struct platform_device *op) if (!viu_regs) { dev_err(&op->dev, "Can't map register set\n"); ret =3D -ENOMEM; - goto err; + goto err_irq; } =20 /* Prepare our private structure */ @@ -1433,7 +1433,7 @@ static int viu_of_probe(struct platform_device *op) if (!viu_dev) { dev_err(&op->dev, "Can't allocate private structure\n"); ret =3D -ENOMEM; - goto err; + goto err_irq; } =20 viu_dev->vr =3D viu_regs; @@ -1449,16 +1449,21 @@ static int viu_of_probe(struct platform_device *op) ret =3D v4l2_device_register(viu_dev->dev, &viu_dev->v4l2_dev); if (ret < 0) { dev_err(&op->dev, "v4l2_device_register() failed: %d\n", ret); - goto err; + goto err_irq; } =20 ad =3D i2c_get_adapter(0); + if (!ad) { + ret =3D -EFAULT; + dev_err(&op->dev, "couldn't get i2c adapter\n"); + goto err_v4l2; + } =20 v4l2_ctrl_handler_init(&viu_dev->hdl, 5); if (viu_dev->hdl.error) { ret =3D viu_dev->hdl.error; dev_err(&op->dev, "couldn't register control\n"); - goto err_vdev; + goto err_i2c; } /* This control handler will inherit the control(s) from the sub-device(s). */ @@ -1476,7 +1481,7 @@ static int viu_of_probe(struct platform_device *op) vdev =3D video_device_alloc(); if (vdev =3D=3D NULL) { ret =3D -ENOMEM; - goto err_vdev; + goto err_hdl; } =20 *vdev =3D viu_template; @@ -1497,7 +1502,7 @@ static int viu_of_probe(struct platform_device *op) ret =3D video_register_device(viu_dev->vdev, VFL_TYPE_GRABBER, -1); if (ret < 0) { video_device_release(viu_dev->vdev); - goto err_vdev; + goto err_unlock; } =20 /* enable VIU clock */ @@ -1505,12 +1510,12 @@ static int viu_of_probe(struct platform_device *op) if (IS_ERR(clk)) { dev_err(&op->dev, "failed to lookup the clock!\n"); ret =3D PTR_ERR(clk); - goto err_clk; + goto err_vdev; } ret =3D clk_prepare_enable(clk); if (ret) { dev_err(&op->dev, "failed to enable the clock!\n"); - goto err_clk; + goto err_vdev; } viu_dev->clk =3D clk; =20 @@ -1521,7 +1526,7 @@ static int viu_of_probe(struct platform_device *op) if (request_irq(viu_dev->irq, viu_intr, 0, "viu", (void *)viu_dev)) { dev_err(&op->dev, "Request VIU IRQ failed.\n"); ret =3D -ENODEV; - goto err_irq; + goto err_clk; } =20 mutex_unlock(&viu_dev->lock); @@ -1529,16 +1534,19 @@ static int viu_of_probe(struct platform_device *op) dev_info(&op->dev, "Freescale VIU Video Capture Board\n"); return ret; =20 -err_irq: - clk_disable_unprepare(viu_dev->clk); err_clk: - video_unregister_device(viu_dev->vdev); + clk_disable_unprepare(viu_dev->clk); err_vdev: - v4l2_ctrl_handler_free(&viu_dev->hdl); + video_unregister_device(viu_dev->vdev); +err_unlock: mutex_unlock(&viu_dev->lock); +err_hdl: + v4l2_ctrl_handler_free(&viu_dev->hdl); +err_i2c: i2c_put_adapter(ad); +err_v4l2: v4l2_device_unregister(&viu_dev->v4l2_dev); -err: +err_irq: irq_dispose_mapping(viu_irq); return ret; } --=20 2.17.1