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 78033C76191 for ; Mon, 15 Jul 2019 14:57:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48036205ED for ; Mon, 15 Jul 2019 14:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563202621; bh=qs7yIuOPi1+YiSsY/HnLBpY7XGQeHN1V7bnDKr98nwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sjjwxQBVVnLENqF7SAn92SZ2rTM2VGwI0+7SDlvUuA/bKp7QoSX/B/W3ST6OLr/fI sZZxeFm98wxC0kogBGaVf0ia82wRzO8BJTmd7PFPdSR2NHKQpxtFE92zx3l80+KNh4 aJ/axVFPU4n/yJc93UenjoM7EoUueI3CzHIEzYYE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390948AbfGOO47 (ORCPT ); Mon, 15 Jul 2019 10:56:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:46670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390486AbfGOOVE (ORCPT ); Mon, 15 Jul 2019 10:21:04 -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 613C7206B8; Mon, 15 Jul 2019 14:21:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200463; bh=qs7yIuOPi1+YiSsY/HnLBpY7XGQeHN1V7bnDKr98nwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qdbn9/CZutgIJGpcO5nv7ewC1H1a9VWIAkZoHSU8eCmutBJGFpafY17+qBgw2ITqb GZBmg9n/qJcfBIiaTOgwlC0D23CZRr0D8xEhejvFdZzUxYeUy8oQsmCaStQTV7Px2l melM2nxVkEo2uylttm7ovlV0IgHxyW3rEulcDSEs= 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 4.19 056/158] media: uvcvideo: Fix access to uninitialized fields on probe error Date: Mon, 15 Jul 2019 10:16:27 -0400 Message-Id: <20190715141809.8445-56-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715141809.8445-1-sashal@kernel.org> References: <20190715141809.8445-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 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