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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 C6754C76195 for ; Mon, 15 Jul 2019 13:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96DC42067C for ; Mon, 15 Jul 2019 13:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198739; bh=GjQA+u9aBEJLTJGjlbfJIQZi4rXEDUDAk/yWBcG3+zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pIGTMwjvAIXngorvzT0ieAS/rflvhsHpg7MCtW4nZqp32ooVaTcTeFk6wWQ+6VvCe H4EfzFVzguYSZWJ1KntsdBtBPIXR8oOe5uttcH/pfMNAvQ7wqsiYCDCdddJ3Q60Fzf BITMFmrGC7khnlwrwxq65bNkIhZzq2wDaJyhtII4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732126AbfGONvp (ORCPT ); Mon, 15 Jul 2019 09:51:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:43784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732120AbfGONvo (ORCPT ); Mon, 15 Jul 2019 09:51:44 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34043216C4; Mon, 15 Jul 2019 13:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198703; bh=GjQA+u9aBEJLTJGjlbfJIQZi4rXEDUDAk/yWBcG3+zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MXL9nTurpvAkc1o3xIBw2wylA72GOrtQ8O+L3AKGedI8FoBID9UYoQMZHlQXsU6gC SjQgUkiJ2qI+UojM1/Gfr8rjeiNhELguAy0a0bcCP+HkACLeBHEdfsYX1CaoBU/CwX LHy3H+GB5UTfZrJBmG5EHa2CmrPugAGUVLeoAbWc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oliver Neukum , syzbot+2e1ef9188251d9cc7944@syzkaller.appspotmail.com, Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 087/249] media: uvcvideo: Fix access to uninitialized fields on probe error Date: Mon, 15 Jul 2019 09:44:12 -0400 Message-Id: <20190715134655.4076-87-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Oliver Neukum [ 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 26163a5bde7d..e399b9fad757 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2345,7 +2345,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