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=-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,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 472AFC18E5B for ; Tue, 10 Mar 2020 13:23:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 156E52467D for ; Tue, 10 Mar 2020 13:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846586; bh=VuexKs39MVjL3+DndPO6XuISqRYdC9A34Djm9UGu9jQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fgqlHSu3fhA3Op42Z+Xls7eVhWkD0z5Z2G3zvSkKAvLmIGqVgiSAxNLz5u1ANdRx6 vMZrJXzLhwJIlj1WaUBlF0Xzvezpul+aE8QHlGChFdDypGP9jsKSiayx4hdlIDQWhu +mJM1j7dwlG53Q+0EI8ok5bh6Y2EhaUjymMazdxk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726712AbgCJNXF (ORCPT ); Tue, 10 Mar 2020 09:23:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:40684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730070AbgCJNAC (ORCPT ); Tue, 10 Mar 2020 09:00:02 -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 553BD2467D; Tue, 10 Mar 2020 13:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845201; bh=VuexKs39MVjL3+DndPO6XuISqRYdC9A34Djm9UGu9jQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qTQVKXz+hgxdm/31yqFchq4G+hv4VswL8uohfL7PVoS0IJYa0+6mYCoOd784nzS5m yMDqy5xqkIU+dKkOLW4VMuug6ZLz+zWLul4SHWdzgQqeyd/7dJY0nJ88kRzdq3QWlG 9+8Hj+070AzkZzk8vVwUBQ2HHygnNc8EsCl3UlUU= 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 5.5 098/189] media: v4l2-mem2mem.c: fix broken links Date: Tue, 10 Mar 2020 13:38:55 +0100 Message-Id: <20200310123649.616518359@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123639.608886314@linuxfoundation.org> References: <20200310123639.608886314@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @@ -880,12 +880,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;