From patchwork Tue Mar 10 12:45:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229610 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 569E8C10F27 for ; Tue, 10 Mar 2020 13:16:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F88D208E4 for ; Tue, 10 Mar 2020 13:16:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846184; bh=z05/4+UxW29/S/5/yxpVB9fWHn4FRXryPt0rocly8Vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xh+VFFqDJdhnK6KqmKTLcShDotbTJ/luVvKfx5JuIENaM4SdB1G6kYpw9p/y7s1A+ xmmuVve0mLLo6aRMJEuQgLu0EEUHBt91QmDOESVWUUQ3xtuxRYbImhTkskYDXKGIY8 QmzV8cVHyJOXTjRHkAwI93mQZ7LUSPjdnb9telMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731688AbgCJNNX (ORCPT ); Tue, 10 Mar 2020 09:13:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:36114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731537AbgCJNNW (ORCPT ); Tue, 10 Mar 2020 09:13:22 -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 C4215208E4; Tue, 10 Mar 2020 13:13:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846002; bh=z05/4+UxW29/S/5/yxpVB9fWHn4FRXryPt0rocly8Vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oQ0xR0aQVTiMQJjwYeiFWLOQ/P9wK02+9XPqItcc3Qa7np+Lh5oh2DuUEDQwEoVPx EPo9Y/UGapWhqLiDMLRWFyh5LLXOKLDeyZNdzgGayj7nvlBuyniX1LgB7VxT2MmPgv hN0XxBzpJ+pXy2JYmj3hy2pMSTFWui8JgBGlYzUs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , Nicolas Dufresne , Mauro Carvalho Chehab Subject: [PATCH 4.19 51/86] media: v4l2-mem2mem.c: fix broken links Date: Tue, 10 Mar 2020 13:45:15 +0100 Message-Id: <20200310124533.550507720@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310124530.808338541@linuxfoundation.org> References: <20200310124530.808338541@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hans Verkuil commit 316e730f1d8bb029fe6cec2468fb2a50424485b3 upstream. The topology that v4l2_m2m_register_media_controller() creates for a processing block actually created a source-to-source link and a sink-to-sink link instead of two source-to-sink links. Unfortunately v4l2-compliance never checked for such bad links, so this went unreported for quite some time. Signed-off-by: Hans Verkuil Reported-by: Nicolas Dufresne Cc: # for v4.19 and up Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/v4l2-mem2mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -787,12 +787,12 @@ int v4l2_m2m_register_media_controller(s goto err_rel_entity1; /* Connect the three entities */ - ret = media_create_pad_link(m2m_dev->source, 0, &m2m_dev->proc, 1, + ret = media_create_pad_link(m2m_dev->source, 0, &m2m_dev->proc, 0, MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED); if (ret) goto err_rel_entity2; - ret = media_create_pad_link(&m2m_dev->proc, 0, &m2m_dev->sink, 0, + ret = media_create_pad_link(&m2m_dev->proc, 1, &m2m_dev->sink, 0, MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED); if (ret) goto err_rm_links0;