Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 08:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: cec-pin-error-inj: avoid a false-positive Spectre detection

Browse Source 
The current logic makes Smatch to false-detect a Spectre variant 1
vulnerability. The problem is that it initializes an u32 indirectly
from user space input.

After trying to write a fixup, after a while I realized that, in
practice, this shouldn't be a problem, as an u32 is initialized
from u8, but it took some time to discover it.

So, do some code cleanup to make it clearer for both humans
and machines about the valid range for "op".

Fix this warning:
	drivers/media/cec/cec-pin-error-inj.c:170 cec_pin_error_inj_parse_line() warn: potential spectre issue 'pin->error_inj_args'

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2018-05-15 15:23:16 -04:00
parent 6992effe53
commit a3d71f256c
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/cec/cec-pin-error-inj.c
View File

@ -81,10 +81,9 @@ bool cec_pin_error_inj_parse_line(struct cec_adapter *adap, char *line)
u64 *error; u64 *error;
u8 *args; u8 *args;
bool has_op; bool has_op;
u32 op; u8 op;
u8 mode; u8 mode;
u8 pos; u8 pos;
u8 v;
p = skip_spaces(p); p = skip_spaces(p);
token = strsep(&p, delims); token = strsep(&p, delims);
@ -146,12 +145,18 @@ bool cec_pin_error_inj_parse_line(struct cec_adapter *adap, char *line)
comma = strchr(token, ','); comma = strchr(token, ',');
if (comma) if (comma)
*comma++ = '\0'; *comma++ = '\0';
if (!strcmp(token, "any")) if (!strcmp(token, "any")) {
op = CEC_ERROR_INJ_OP_ANY; has_op = false;
else if (!kstrtou8(token, 0, &v)) error = pin->error_inj + CEC_ERROR_INJ_OP_ANY;
op = v; args = pin->error_inj_args[CEC_ERROR_INJ_OP_ANY];
else } else if (!kstrtou8(token, 0, &op)) {
has_op = true;
error = pin->error_inj + op;
args = pin->error_inj_args[op];
} else {
return false; return false;
}
mode = CEC_ERROR_INJ_MODE_ONCE; mode = CEC_ERROR_INJ_MODE_ONCE;
if (comma) { if (comma) {
if (!strcmp(comma, "off")) if (!strcmp(comma, "off"))
@ -166,10 +171,6 @@ bool cec_pin_error_inj_parse_line(struct cec_adapter *adap, char *line)
return false; return false;
} }
error = pin->error_inj + op;
args = pin->error_inj_args[op];
has_op = op <= 0xff;
token = strsep(&p, delims); token = strsep(&p, delims);
if (p) { if (p) {
p = skip_spaces(p); p = skip_spaces(p);