From: Dan Carpenter <dan.carpenter@oracle.com>
To: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] [media] tw686x: off by one bugs in tw686x_fields_map()
Date: Wed, 27 Apr 2016 11:09:28 +0300 [thread overview]
Message-ID: <20160427080928.GC22469@mwanda> (raw)
The > ARRAY_SIZE() should be >= ARRAY_SIZE(). Also this is a slightly
unrelated cleanup but I replaced the magic numbers 30 and 25 with
ARRAY_SIZE() - 1.
Fixes: 363d79f1d5bd ('[media] tw686x: Don't go past array')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/media/pci/tw686x/tw686x-video.c b/drivers/media/pci/tw686x/tw686x-video.c
index d2a0147..7b87f27 100644
--- a/drivers/media/pci/tw686x/tw686x-video.c
+++ b/drivers/media/pci/tw686x/tw686x-video.c
@@ -64,12 +64,12 @@ static unsigned int tw686x_fields_map(v4l2_std_id std, unsigned int fps)
unsigned int i;
if (std & V4L2_STD_525_60) {
- if (fps > ARRAY_SIZE(std_525_60))
- fps = 30;
+ if (fps >= ARRAY_SIZE(std_525_60))
+ fps = ARRAY_SIZE(std_525_60) - 1;
i = std_525_60[fps];
} else {
- if (fps > ARRAY_SIZE(std_625_50))
- fps = 25;
+ if (fps >= ARRAY_SIZE(std_625_50))
+ fps = ARRAY_SIZE(std_625_50) - 1;
i = std_625_50[fps];
}
next reply other threads:[~2016-04-27 8:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-27 8:09 Dan Carpenter [this message]
2016-04-27 10:31 ` [patch] [media] tw686x: off by one bugs in tw686x_fields_map() Mauro Carvalho Chehab
2016-04-27 10:36 ` Dan Carpenter
2016-04-27 10:40 ` Mauro Carvalho Chehab
2016-04-27 11:01 ` [PATCH] tw686x: use a formula instead of two tables for div Mauro Carvalho Chehab
2016-04-27 12:00 ` Mauro Carvalho Chehab
2016-04-27 15:17 ` [PATCH v2] [media] tw686x: cleanup the fps estimation code Mauro Carvalho Chehab
2016-04-27 15:27 ` [PATCH v3] tw686x: use a formula instead of two tables for div Mauro Carvalho Chehab
2016-06-27 15:45 ` Ezequiel Garcia
2016-06-27 17:38 ` Mauro Carvalho Chehab
2016-06-29 0:11 ` Ezequiel Garcia
2016-04-27 22:50 ` [PATCH] " 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=20160427080928.GC22469@mwanda \
--to=dan.carpenter@oracle.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.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