提交 6eeabd8b 编写于 作者: C Colin Ian King 提交者: Greg Kroah-Hartman

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: NColin Ian King <colin.king@canonical.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 8ed78a15
...@@ -67,7 +67,7 @@ int vlv2_plat_set_clock_freq(int clk_num, int freq_type) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册