p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: media: atomisp: fix range checking on clk_num 

The range checking on clk_num is incorrect; fix these so that invalid
clk_num values are detected correctly.

Detected by static analysis with by PVS-Studio

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Ian King 2017-04-14 15:25:40 +01:00 committed by Greg Kroah-Hartman
parent 8ed78a154e
commit 6eeabd8b2b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
View File

@ -67,7 +67,7 @@ int vlv2_plat_set_clock_freq(int clk_num, int freq_type)
{ {
void __iomem *addr; void __iomem *addr;
if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
pr_err("Clock number out of range (%d)\n", clk_num); pr_err("Clock number out of range (%d)\n", clk_num);
return -EINVAL; return -EINVAL;
} }
@ -103,7 +103,7 @@ int vlv2_plat_get_clock_freq(int clk_num)
{ {
u32 ret; u32 ret;
if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
pr_err("Clock number out of range (%d)\n", clk_num); pr_err("Clock number out of range (%d)\n", clk_num);
return -EINVAL; return -EINVAL;
} }
@ -133,7 +133,7 @@ int vlv2_plat_configure_clock(int clk_num, u32 conf)
{ {
void __iomem *addr; void __iomem *addr;
if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
pr_err("Clock number out of range (%d)\n", clk_num); pr_err("Clock number out of range (%d)\n", clk_num);
return -EINVAL; return -EINVAL;
} }
@ -169,7 +169,7 @@ int vlv2_plat_get_clock_status(int clk_num)
{ {
int ret; int ret;
if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
pr_err("Clock number out of range (%d)\n", clk_num); pr_err("Clock number out of range (%d)\n", clk_num);
return -EINVAL; return -EINVAL;
} }