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=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 67629C76195 for ; Mon, 15 Jul 2019 15:04:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3683F20651 for ; Mon, 15 Jul 2019 15:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563203056; bh=DFKCF5t4ld05/ZNuT6Ta+3nNlNLCVq+XxwCK4tQ93jU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u79/zDMbx512p0FqQDZDhXhsPjgz3GREIBxOMYzIn1yvHQADhhVa8vmcZs5eWXtNa ealMJ9NMLTHfAN7Dv5lrN/ZFRxeP6VpdtczdkLMuNg/EIdFaQqVNMK+4Z1aBrC4J2/ 2L/DAo8UHXxwVyjVPj2gzICi18UJrfO7VBZ+A+jg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388492AbfGOOIV (ORCPT ); Mon, 15 Jul 2019 10:08:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:58324 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388474AbfGOOIR (ORCPT ); Mon, 15 Jul 2019 10:08:17 -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 27BEB2081C; Mon, 15 Jul 2019 14:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199696; bh=DFKCF5t4ld05/ZNuT6Ta+3nNlNLCVq+XxwCK4tQ93jU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vMoRC+v1wtZuxXslxq0CNQhz5Adxl0cPbfzf7EVu3M2g791wsUxllO/uQ7D+eMjwt PBE0nuNHqYhp09VQlGIiJEtlgkgfNSwL7YcnIpAzTLNYxjr2mh2NTj890L1D/DGaRH q5DhL5/R5cYOWnOmJ8D377LlBC+FyaQra5SBwUJ8= 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.1 075/219] media: uvcvideo: Fix access to uninitialized fields on probe error Date: Mon, 15 Jul 2019 10:01:16 -0400 Message-Id: <20190715140341.6443-75-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715140341.6443-1-sashal@kernel.org> References: <20190715140341.6443-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 14cff91b7aea..aa021498036a 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