From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: YongSu Yoo <yongsuyoo0215@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org
Subject: [PATCH 11/24] media: dvb_ca_en50221: fix a size write bug
Date: Sat, 13 May 2023 18:57:28 +0100 [thread overview]
Message-ID: <9548a43e8934564309ae22d35c501073358776b4.1684000646.git.mchehab@kernel.org> (raw)
In-Reply-To: <53558de2b5c4f4ee6bfcfbe34e27071c2d0073d5.1684000646.git.mchehab@kernel.org>
From: YongSu Yoo <yongsuyoo0215@gmail.com>
The function of "dvb_ca_en50221_write_data" at source/drivers/media
/dvb-core/dvb_ca_en50221.c is used for two cases.
The first case is for writing APDU data in the function of
"dvb_ca_en50221_io_write" at source/drivers/media/dvb-core/
dvb_ca_en50221.c.
The second case is for writing the host link buf size on the
Command Register in the function of "dvb_ca_en50221_link_init"
at source/drivers/media/dvb-core/dvb_ca_en50221.c.
In the second case, there exists a bug like followings.
In the function of the "dvb_ca_en50221_link_init",
after a TV host calculates the host link buf_size,
the TV host writes the calculated host link buf_size on the
Size Register.
Accroding to the en50221 Spec (the page 60 of
https://dvb.org/wp-content/uploads/2020/02/En50221.V1.pdf),
before this writing operation, the "SW(CMDREG_SW)" flag in the
Command Register should be set. We can see this setting operation
in the function of the "dvb_ca_en50221_link_init" like below.
...
if ((ret = ca->pub->write_cam_control(ca->pub, slot,
CTRLIF_COMMAND, IRQEN | CMDREG_SW)) != 0)
return ret;
...
But, after that, the real writing operation is implemented using
the function of the "dvb_ca_en50221_write_data" in the function of
"dvb_ca_en50221_link_init", and the "dvb_ca_en50221_write_data"
includes the function of "ca->pub->write_cam_control",
and the function of the "ca->pub->write_cam_control" in the
function of the "dvb_ca_en50221_wrte_data" does not include
"CMDREG_SW" flag like below.
...
if ((status = ca->pub->write_cam_control(ca->pub, slot,
CTRLIF_COMMAND, IRQEN | CMDREG_HC)) != 0)
...
In the above source code, we can see only the "IRQEN | CMDREG_HC",
but we cannot see the "CMDREG_SW".
The "CMDREG_SW" flag which was set in the function of the
"dvb_ca_en50221_link_init" was rollbacked by the follwoing function
of the "dvb_ca_en50221_write_data".
This is a bug. and this bug causes that the calculated host link buf_size
is not properly written in the CI module.
Through this patch, we fix this bug.
Link: https://lore.kernel.org/linux-media/20220818125027.1131-1-yongsuyoo0215@gmail.com
Signed-off-by: YongSu Yoo <yongsuyoo0215@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
drivers/media/dvb-core/dvb_ca_en50221.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index c2d2792227f8..b6ca29dfb184 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -187,7 +187,7 @@ static void dvb_ca_en50221_thread_wakeup(struct dvb_ca_private *ca);
static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot,
u8 *ebuf, int ecount);
static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot,
- u8 *ebuf, int ecount);
+ u8 *ebuf, int ecount, int size_write_flag);
/**
* findstr - Safely find needle in haystack.
@@ -370,7 +370,7 @@ static int dvb_ca_en50221_link_init(struct dvb_ca_private *ca, int slot)
ret = dvb_ca_en50221_wait_if_status(ca, slot, STATUSREG_FR, HZ / 10);
if (ret)
return ret;
- ret = dvb_ca_en50221_write_data(ca, slot, buf, 2);
+ ret = dvb_ca_en50221_write_data(ca, slot, buf, 2, CMDREG_SW);
if (ret != 2)
return -EIO;
ret = ca->pub->write_cam_control(ca->pub, slot, CTRLIF_COMMAND, IRQEN);
@@ -778,11 +778,13 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot,
* @buf: The data in this buffer is treated as a complete link-level packet to
* be written.
* @bytes_write: Size of ebuf.
+ * @size_write_flag: A flag on Command Register which says whether the link size
+ * information will be writen or not.
*
* return: Number of bytes written, or < 0 on error.
*/
static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot,
- u8 *buf, int bytes_write)
+ u8 *buf, int bytes_write, int size_write_flag)
{
struct dvb_ca_slot *sl = &ca->slot_info[slot];
int status;
@@ -817,7 +819,7 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot,
/* OK, set HC bit */
status = ca->pub->write_cam_control(ca->pub, slot, CTRLIF_COMMAND,
- IRQEN | CMDREG_HC);
+ IRQEN | CMDREG_HC | size_write_flag);
if (status)
goto exit;
@@ -1508,7 +1510,7 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
mutex_lock(&sl->slot_lock);
status = dvb_ca_en50221_write_data(ca, slot, fragbuf,
- fraglen + 2);
+ fraglen + 2, 0);
mutex_unlock(&sl->slot_lock);
if (status == (fraglen + 2)) {
written = 1;
--
2.40.1
next prev parent reply other threads:[~2023-05-13 17:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-13 17:57 [PATCH 01/24] media: pvrusb2: fix DVB_CORE dependency Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 02/24] media: dvb_demux: fix a bug for the continuity counter Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 03/24] media: netup_unidvb: fix use-after-free bug caused by del_timer() Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 04/24] media: dvb-usb: az6027: fix three null-ptr-deref in az6027_i2c_xfer() Mauro Carvalho Chehab
2023-05-17 5:06 ` zzam
2023-05-13 17:57 ` [PATCH 05/24] media: dvb-usb-v2: ec168: fix null-ptr-deref in ec168_i2c_xfer() Mauro Carvalho Chehab
2023-05-17 5:10 ` zzam
2023-05-19 9:17 ` Wei Chen
2023-06-02 6:41 ` zzam
2023-05-13 17:57 ` [PATCH 06/24] media: dvb-usb-v2: ce6230: fix null-ptr-deref in ce6230_i2c_master_xfer() Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 07/24] media: dvb-usb-v2: rtl28xxu: fix null-ptr-deref in rtl28xxu_i2c_xfer Mauro Carvalho Chehab
2023-05-17 6:55 ` zzam
2023-05-13 17:57 ` [PATCH 08/24] media: dvb-usb: digitv: fix null-ptr-deref in digitv_i2c_xfer() Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 09/24] media: dvb-usb: dw2102: fix uninit-value in su3000_read_mac_address Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 10/24] media: netup_unidvb: fix irq init by register it at the end of probe Mauro Carvalho Chehab
2023-05-13 17:57 ` Mauro Carvalho Chehab [this message]
2023-05-13 17:57 ` [PATCH 12/24] media: ttusb-dec: fix memory leak in ttusb_dec_exit_dvb() Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 13/24] media: mn88443x: fix !CONFIG_OF error by drop of_match_ptr from ID table Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 14/24] media: dvb-core: Fix use-after-free due to race condition occurring in dvb_frontend Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 15/24] media: dvb-core: Fix use-after-free due to race condition occurring in dvb_net Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 16/24] media: dvb-core: Fix use-after-free due to race condition occurring in dvb_register_device() Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 17/24] media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*() Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 18/24] media: dvbdev: fix most coding style issues Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 19/24] media: dvbdev.h: do some kernel-doc cleanups Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 20/24] media: c8sectpfe: dvb: remove unnecessary (void*) conversions Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 21/24] media: dvb-usb: " Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 22/24] media: dw2102: return -EIO instead of -1 for mac address read errors Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 23/24] media: dvb: add missing DVB-S2X FEC parameter values Mauro Carvalho Chehab
2023-05-13 17:57 ` [PATCH 24/24] media: dvb: bump DVB API version Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9548a43e8934564309ae22d35c501073358776b4.1684000646.git.mchehab@kernel.org \
--to=mchehab@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=yongsuyoo0215@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®