* [PATCH] cec-funcs.h: add length checks
@ 2016-07-06 8:49 Hans Verkuil
0 siblings, 0 replies; only message in thread
From: Hans Verkuil @ 2016-07-06 8:49 UTC (permalink / raw)
To: linux-media; +Cc: Dan Carpenter
Add msg->len sanity checks to fix static checker warning:
include/linux/cec-funcs.h:1154 cec_ops_set_osd_string()
warn: setting length 'msg->len - 3' to negative one
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h
index 19486009..8d217ce 100644
--- a/include/linux/cec-funcs.h
+++ b/include/linux/cec-funcs.h
@@ -788,7 +788,7 @@ static inline void cec_msg_set_timer_program_title(struct cec_msg *msg,
static inline void cec_ops_set_timer_program_title(const struct cec_msg *msg,
char *prog_title)
{
- unsigned int len = msg->len - 2;
+ unsigned int len = msg->len > 2 ? msg->len - 2 : 0;
if (len > 14)
len = 14;
@@ -1167,7 +1167,7 @@ static inline void cec_ops_set_osd_string(const struct cec_msg *msg,
__u8 *disp_ctl,
char *osd)
{
- unsigned int len = msg->len - 3;
+ unsigned int len = msg->len > 3 ? msg->len - 3 : 0;
*disp_ctl = msg->msg[2];
if (len > 13)
@@ -1192,7 +1192,7 @@ static inline void cec_msg_set_osd_name(struct cec_msg *msg, const char *name)
static inline void cec_ops_set_osd_name(const struct cec_msg *msg,
char *name)
{
- unsigned int len = msg->len - 2;
+ unsigned int len = msg->len > 2 ? msg->len - 2 : 0;
if (len > 14)
len = 14;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-07-06 8:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-06 8:49 [PATCH] cec-funcs.h: add length checks Hans Verkuil
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).