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 DCD8BC3A5A7 for ; Tue, 3 Sep 2019 16:38:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC6662339D for ; Tue, 3 Sep 2019 16:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528718; bh=Eij9Lcp61mwnXfyqWxsgTftupagr0ZRNvm2GXlKk+Yk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E/UnyS9KBXk4nWhSZTBZzGnZgQeIdGsLDvB7eHagOiWrb9iLXWK77Xeysc/mo/oHw bJghIvNAFCxSNFTVktZRTpYugEXom2e55It9u18NuD1UN32mvvfnBfpnw/fpWb+1Nm Ff1zyyj+POAPJsNSiF9iBg0aSWbEgXIQT86CEHXA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730588AbfICQ0S (ORCPT ); Tue, 3 Sep 2019 12:26:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:47034 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730581AbfICQ0R (ORCPT ); Tue, 3 Sep 2019 12:26:17 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.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 E52FF238CD; Tue, 3 Sep 2019 16:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527976; bh=Eij9Lcp61mwnXfyqWxsgTftupagr0ZRNvm2GXlKk+Yk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kSORdLEWlYxc6tUgSCDL+dctOdCbB9UPccj+lR5yBak8vwmJ00tGJxAR2mI7JRFWC Ny4hl++ElgImJo+2agxpM86DJoIFc8v74AEnvUvECNqUWlCf0TdLLnIjAeWLFx/Jjn UV7k8hSiT3PXdYY6NQxqDFIQ0PgGBRTCZCmp79JE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , syzbot+69780d144754b8071f4b@syzkaller.appspotmail.com, Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 032/167] media: vim2m: use cancel_delayed_work_sync instead of flush_schedule_work Date: Tue, 3 Sep 2019 12:23:04 -0400 Message-Id: <20190903162519.7136-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hans Verkuil [ Upstream commit 52117be68b82ee05c96da0a7beec319906ccf6cc ] The use of flush_schedule_work() made no sense and caused a syzkaller error. Replace with the correct cancel_delayed_work_sync(). Signed-off-by: Hans Verkuil Reported-by: syzbot+69780d144754b8071f4b@syzkaller.appspotmail.com Cc: # for v4.20 and up Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/vim2m.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c index 6f87ef025ff19..de7f9fe7e7cd9 100644 --- a/drivers/media/platform/vim2m.c +++ b/drivers/media/platform/vim2m.c @@ -797,10 +797,11 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned count) static void vim2m_stop_streaming(struct vb2_queue *q) { struct vim2m_ctx *ctx = vb2_get_drv_priv(q); + struct vim2m_dev *dev = ctx->dev; struct vb2_v4l2_buffer *vbuf; unsigned long flags; - flush_scheduled_work(); + cancel_delayed_work_sync(&dev->work_run); for (;;) { if (V4L2_TYPE_IS_OUTPUT(q->type)) vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); -- 2.20.1