LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH][media-next] media: ddbridge: avoid out-of-bounds write on array demod_in_use
@ 2018-05-07 23:08 Colin King
  2018-05-08 10:38 ` Daniel Scheller
  0 siblings, 1 reply; 4+ messages in thread
From: Colin King @ 2018-05-07 23:08 UTC (permalink / raw)
  To: Daniel Scheller, Mauro Carvalho Chehab, linux-media
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

In function stop there is a check to see if state->demod is a stopped
value of 0xff, however, later on, array demod_in_use is indexed with
this value causing an out-of-bounds write error.  Avoid this by only
writing to array demod_in_use if state->demod is not set to the stopped
sentinal value for this specific corner case.  Also, replace the magic
value 0xff with DEMOD_STOPPED to make code more readable.

Detected by CoverityScan, CID#1468550 ("Out-of-bounds write")

Fixes: daeeb1319e6f ("media: ddbridge: initial support for MCI-based MaxSX8 cards")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/media/pci/ddbridge/ddbridge-mci.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/media/pci/ddbridge/ddbridge-mci.c b/drivers/media/pci/ddbridge/ddbridge-mci.c
index a85ff3e6b919..1f5ed53c8d35 100644
--- a/drivers/media/pci/ddbridge/ddbridge-mci.c
+++ b/drivers/media/pci/ddbridge/ddbridge-mci.c
@@ -20,6 +20,8 @@
 #include "ddbridge-io.h"
 #include "ddbridge-mci.h"
 
+#define DEMOD_STOPPED	(0xff)
+
 static LIST_HEAD(mci_list);
 
 static const u32 MCLK = (1550000000 / 12);
@@ -193,7 +195,7 @@ static int stop(struct dvb_frontend *fe)
 	u32 input = state->tuner;
 
 	memset(&cmd, 0, sizeof(cmd));
-	if (state->demod != 0xff) {
+	if (state->demod != DEMOD_STOPPED) {
 		cmd.command = MCI_CMD_STOP;
 		cmd.demod = state->demod;
 		mci_cmd(state, &cmd, NULL);
@@ -209,10 +211,11 @@ static int stop(struct dvb_frontend *fe)
 	state->base->tuner_use_count[input]--;
 	if (!state->base->tuner_use_count[input])
 		mci_set_tuner(fe, input, 0);
-	state->base->demod_in_use[state->demod] = 0;
+	if (state->demod != DEMOD_STOPPED)
+		state->base->demod_in_use[state->demod] = 0;
 	state->base->used_ldpc_bitrate[state->nr] = 0;
-	state->demod = 0xff;
-	state->base->assigned_demod[state->nr] = 0xff;
+	state->demod = DEMOD_STOPPED;
+	state->base->assigned_demod[state->nr] = DEMOD_STOPPED;
 	state->base->iq_mode = 0;
 	mutex_unlock(&state->base->tuner_lock);
 	state->started = 0;
-- 
2.17.0

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-05-09 20:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-07 23:08 [PATCH][media-next] media: ddbridge: avoid out-of-bounds write on array demod_in_use Colin King
2018-05-08 10:38 ` Daniel Scheller
2018-05-08 10:39   ` Colin Ian King
2018-05-09 20:13     ` Daniel Scheller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).