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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 C2078C35247 for ; Tue, 4 Feb 2020 18:13:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 944242087E for ; Tue, 4 Feb 2020 18:13:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="k2yNKHsM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727442AbgBDSNM (ORCPT ); Tue, 4 Feb 2020 13:13:12 -0500 Received: from lb1-smtp-cloud9.xs4all.net ([194.109.24.22]:40409 "EHLO lb1-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727361AbgBDSNL (ORCPT ); Tue, 4 Feb 2020 13:13:11 -0500 Received: from [192.168.2.10] ([46.9.235.248]) by smtp-cloud9.xs4all.net with ESMTPA id z2h8iucc82Mf2z2hBiba7g; Tue, 04 Feb 2020 19:13:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s1; t=1580839989; bh=SCZLPeg4KcvMQcqzhOZt+G/n1eNM1/ECRob+23uHIX4=; h=To:From:Subject:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=k2yNKHsMvSPv/x4Y4xW1chEOq5Klo+lG68Nf/m0gpBPVqNqRCWHHPXZSYaEET6H35 YTET/KTAwekzdpo1p4ThgC3waS98Csl6gXjg1CBuUlTQZkDbBLQKh1aDqDuFtZ5A9n 3ibS1tB8Lt7QbHj0/VxHw/cO8XXexseFOzZn91amZ1a8lf3UcDhST1uCCiHsaVRfFZ nlxtfAdRJWrQOCXJ8xR2M9YT4wonYcZP9nyzg2dw1OF1QPXQ7oscox+YYm/dSqgAze /UeSGkNBUToesIGKxXnCo1aG7JVtOojcvdFS4AfHvbtqsixu3Q+4m4Dk3kx7ioy7Ij ukU/hMpRjqWSg== To: Linux Media Mailing List From: Hans Verkuil Subject: [PATCH for v5.6] v4l2-mem2mem.c: fix broken links Cc: Nicolas Dufresne Message-ID: <8974b23a-6823-d47b-fda4-fe9bd6f7e6d1@xs4all.nl> Date: Tue, 4 Feb 2020 19:13:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfNQGrGyNiLzcQtxIvN3X6gn0j/7dadLAV9wlTdASvefF7Wm1NsiR2Uakcg4OYyhX1He9H4WclXUVQnfmL2HQKx7OOEZA+46+w+gux2vDzDO7Evhgr+II 9J+ri1K7oEkM6swpdx96FA0SkoZooZxc57tH4y4K+WfGhZlMFhaRKjtXTa0RlW9oFu7FjkTt0A/teL8TM3IcbTB9YvIxqQW9JPs= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c index 1afd9c6ad908..cc34c5ab7009 100644 --- 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(struct v4l2_m2m_dev *m2m_dev, 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;