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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D460FC7EE29 for ; Thu, 25 May 2023 18:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242945AbjEYStW (ORCPT ); Thu, 25 May 2023 14:49:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242872AbjEYSpg (ORCPT ); Thu, 25 May 2023 14:45:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 236651B5; Thu, 25 May 2023 11:41:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C47B96491B; Thu, 25 May 2023 18:41:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FB0DC433D2; Thu, 25 May 2023 18:41:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685040082; bh=/aQHJrkPZV+ML/j/omdPFfLwhiWitT9bbB2gtn71rlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VPsVXesTjBKSh6KOmkDMvGjZ6bJO04X2ZEiy3xBa0o+5ocmkLf2monCr/eEYwY4QE aPHcmnXvSBE9+AEGPNuPVGGHeNWbMkpJ4rmq3yhAY/PEPbCOgwe2ysii+fzdc1RCM5 cxg+6mRELC2yp4ogpG2NndSOJAXpPosneji+LSAdVV3bESmgpA9rzlkzJUKj50TZuv rTUVBWzXA0uPkoz1wkz0M84veBYSqoObLB0HZNkrulaDBuOsNOdyIkC8ZN1rI0zes2 7ZkUuzX9CtnNq4K5Nkr61heOy+iDzetypzAV6vH6zDpYEUOI3cJDqWk7GAcdGifExT Swsg+Xl2DoEKw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YongSu Yoo , Mauro Carvalho Chehab , Sasha Levin , hverkuil-cisco@xs4all.nl, tommaso.merciai@amarulasolutions.com, colin.i.king@gmail.com, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 06/31] media: dvb_demux: fix a bug for the continuity counter Date: Thu, 25 May 2023 14:40:37 -0400 Message-Id: <20230525184105.1909399-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525184105.1909399-1-sashal@kernel.org> References: <20230525184105.1909399-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YongSu Yoo [ Upstream commit 7efb10d8dc70ea3000cc70dca53407c52488acd1 ] In dvb_demux.c, some logics exist which compare the expected continuity counter and the real continuity counter. If they are not matched each other, both of the expected continuity counter and the real continuity counter should be printed. But there exists a bug that the expected continuity counter is not correctly printed. The expected continuity counter is replaced with the real countinuity counter + 1 so that the epected continuity counter is not correclty printed. This is wrong. This bug is fixed. Link: https://lore.kernel.org/linux-media/20230305212519.499-1-yongsuyoo0215@gmail.com Signed-off-by: YongSu Yoo Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/dvb-core/dvb_demux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index 5fde1d38b3e34..80b495982f63c 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_demux.c @@ -125,12 +125,12 @@ static inline int dvb_dmx_swfilter_payload(struct dvb_demux_feed *feed, cc = buf[3] & 0x0f; ccok = ((feed->cc + 1) & 0x0f) == cc; - feed->cc = cc; if (!ccok) { set_buf_flags(feed, DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED); dprintk_sect_loss("missed packet: %d instead of %d!\n", cc, (feed->cc + 1) & 0x0f); } + feed->cc = cc; if (buf[1] & 0x40) // PUSI ? feed->peslen = 0xfffa; @@ -310,7 +310,6 @@ static int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, cc = buf[3] & 0x0f; ccok = ((feed->cc + 1) & 0x0f) == cc; - feed->cc = cc; if (buf[3] & 0x20) { /* adaption field present, check for discontinuity_indicator */ @@ -346,6 +345,7 @@ static int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, feed->pusi_seen = false; dvb_dmx_swfilter_section_new(feed); } + feed->cc = cc; if (buf[1] & 0x40) { /* PUSI=1 (is set), section boundary is here */ -- 2.39.2