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,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 6AFF3C33C9B for ; Tue, 7 Jan 2020 21:07:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 395842072A for ; Tue, 7 Jan 2020 21:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578431235; bh=PJiUvpwPoyr1arg9rtkaT0ebDJHK7JIlcm/v/7n7Xrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HRgO869nnMgckxVsv8hXcdpx3aRqRMtmnb0EuYOyIUC1TIJ0T1Evk4mtIvwwzvQ75 ClUT5TBmWCqrYOVeCaAotoeTW60p0YM8KzMURk0Pf8DmKPsnDd/AHQTOvPIChUAs95 5rvT+2sRhNNB2SUqDoXM4T3wjHuEoVmRKdsWkt24= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729176AbgAGVHN (ORCPT ); Tue, 7 Jan 2020 16:07:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:57182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729467AbgAGVHE (ORCPT ); Tue, 7 Jan 2020 16:07:04 -0500 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 9263F2077B; Tue, 7 Jan 2020 21:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578431224; bh=PJiUvpwPoyr1arg9rtkaT0ebDJHK7JIlcm/v/7n7Xrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Si968RFwfdsmOA5eoZgQBYycCHPpNyd9gZhkZYfMClwun0xvPcXpkVQSUCBS65Sf5 gjqL7/5gibU2pjxtpDz06qAJuNNso6BL2gm/x3HRo3lEtGwozBReSJUWMw6yu5xA+L iHxZ442ZCS8tQOQXsNaHdyziGfI7VfIA2vqDGBdE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.19 049/115] media: cec: CEC 2.0-only bcast messages were ignored Date: Tue, 7 Jan 2020 21:54:19 +0100 Message-Id: <20200107205302.396648397@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107205240.283674026@linuxfoundation.org> References: <20200107205240.283674026@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil commit cec935ce69fc386f13959578deb40963ebbb85c3 upstream. Some messages are allowed to be a broadcast message in CEC 2.0 only, and should be ignored by CEC 1.4 devices. Unfortunately, the check was wrong, causing such messages to be marked as invalid under CEC 2.0. Signed-off-by: Hans Verkuil Cc: # for v4.10 and up Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/cec/cec-adap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/media/cec/cec-adap.c +++ b/drivers/media/cec/cec-adap.c @@ -1038,11 +1038,11 @@ void cec_received_msg_ts(struct cec_adap valid_la = false; else if (!cec_msg_is_broadcast(msg) && !(dir_fl & DIRECTED)) valid_la = false; - else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST1_4)) + else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST)) valid_la = false; else if (cec_msg_is_broadcast(msg) && - adap->log_addrs.cec_version >= CEC_OP_CEC_VERSION_2_0 && - !(dir_fl & BCAST2_0)) + adap->log_addrs.cec_version < CEC_OP_CEC_VERSION_2_0 && + !(dir_fl & BCAST1_4)) valid_la = false; } if (valid_la && min_len) {