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,URIBL_BLOCKED,USER_AGENT_GIT 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 A89F8C76186 for ; Wed, 24 Jul 2019 20:03:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B27D2147A for ; Wed, 24 Jul 2019 20:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998627; bh=PzCYWCyELM16TJPLUlAN2chL9JFCp2DEFuWMgzwqbvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TZf9p5A3mqqVAsSSIdl3W5+VTD3Zqc4TdJTvtD7fv2Q513/dOFB+cKQi/fMcMvJQe HtL6+sO+EXXumE2mUyP4LvbPpcWTTVhES/U2azjHDTptVyPi6dFLNdX4aT2HdPjr1l J4OKdcBIy3/u5AlNBqgpZBvWbxaWbv+/z//Rr8Cc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392381AbfGXUDq (ORCPT ); Wed, 24 Jul 2019 16:03:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:54402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392328AbfGXUDp (ORCPT ); Wed, 24 Jul 2019 16:03:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 7F3FC214AF; Wed, 24 Jul 2019 20:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998625; bh=PzCYWCyELM16TJPLUlAN2chL9JFCp2DEFuWMgzwqbvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hMU1/v6NX/SUyQb+NFXgE3/lE5T1/J5ajRnKqlIKnH7i2Li18z35dDqxbXn9X8fSF 2nSrOd/sbQABea5BtvZxPYYknCfC1NbMtf2OAxufPlct5guRDUmYx52UJ63ggl7hJu F6FnrYoFk8dAhAKqMYvCJl7geQHIt7478m4gAlSQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oliver Neukum , syzbot+2e1ef9188251d9cc7944@syzkaller.appspotmail.com, Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 058/271] media: uvcvideo: Fix access to uninitialized fields on probe error Date: Wed, 24 Jul 2019 21:18:47 +0200 Message-Id: <20190724191700.129205442@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191655.268628197@linuxfoundation.org> References: <20190724191655.268628197@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 11a087f484bf15ff65f0a9f277aa5a61fd07ed2a ] We need to check whether this work we are canceling actually is initialized. Signed-off-by: Oliver Neukum Reported-by: syzbot+2e1ef9188251d9cc7944@syzkaller.appspotmail.com Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/uvc/uvc_ctrl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 467b1ddaf4e7..f2854337cdca 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2350,7 +2350,9 @@ void uvc_ctrl_cleanup_device(struct uvc_device *dev) struct uvc_entity *entity; unsigned int i; - cancel_work_sync(&dev->async_ctrl.work); + /* Can be uninitialized if we are aborting on probe error. */ + if (dev->async_ctrl.work.func) + cancel_work_sync(&dev->async_ctrl.work); /* Free controls and control mappings for all entities. */ list_for_each_entry(entity, &dev->entities, list) { -- 2.20.1