nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: check untrusted num_entries for clock controls

Browse Source 
Jira DNVGPU-125

Change-Id: I0e547b05d57c08f76327869c189498e82f4ffd1a
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: http://git-master/r/1244916
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Thomas Fleury
2016-10-28 17:11:36 -07:00
committed by mobile promotions
parent 60a9fcb467
commit b6411b0290
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
View File

@@ -927,6 +927,7 @@ static int nvgpu_gpu_clk_get_range(struct gk20a *g,
u32 clk_domains = 0; u32 clk_domains = 0;
u32 num_domains; u32 num_domains;
u32 num_entries;
u32 i; u32 i;
int bit; int bit;
int err; int err;
@@ -936,10 +937,10 @@ static int nvgpu_gpu_clk_get_range(struct gk20a *g,
if (!session) if (!session)
return -EINVAL; return -EINVAL;
if (!args->flags) {
clk_domains = nvgpu_clk_arb_get_arbiter_clk_domains(g); clk_domains = nvgpu_clk_arb_get_arbiter_clk_domains(g);
num_domains = hweight_long(clk_domains); num_domains = hweight_long(clk_domains);
if (!args->flags) {
if (!args->num_entries) { if (!args->num_entries) {
args->num_entries = num_domains; args->num_entries = num_domains;
return 0; return 0;
@@ -949,18 +950,21 @@ static int nvgpu_gpu_clk_get_range(struct gk20a *g,
return -EINVAL; return -EINVAL;
args->num_entries = 0; args->num_entries = 0;
num_entries = num_domains;
} else { } else {
if (args->flags != NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS) if (args->flags != NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS)
return -EINVAL; return -EINVAL;
num_domains = args->num_entries; num_entries = args->num_entries;
if (num_entries > num_domains)
return -EINVAL;
} }
entry = (struct nvgpu_gpu_clk_range __user *) entry = (struct nvgpu_gpu_clk_range __user *)
(uintptr_t)args->clk_range_entries; (uintptr_t)args->clk_range_entries;
for (i = 0; i < num_domains; i++, entry++) { for (i = 0; i < num_entries; i++, entry++) {
if (args->flags == NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS) { if (args->flags == NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS) {
if (copy_from_user(&clk_range, (void __user *)entry, if (copy_from_user(&clk_range, (void __user *)entry,
@@ -984,7 +988,7 @@ static int nvgpu_gpu_clk_get_range(struct gk20a *g,
return -EFAULT; return -EFAULT;
} }
args->num_entries = num_domains; args->num_entries = num_entries;
return 0; return 0;
} }
@@ -1051,6 +1055,7 @@ static int nvgpu_gpu_clk_get_info(struct gk20a *g,
struct nvgpu_clk_session *session = priv->clk_session; struct nvgpu_clk_session *session = priv->clk_session;
u32 clk_domains = 0; u32 clk_domains = 0;
u32 num_domains; u32 num_domains;
u32 num_entries;
u32 i; u32 i;
int err; int err;
int bit; int bit;
@@ -1060,10 +1065,10 @@ static int nvgpu_gpu_clk_get_info(struct gk20a *g,
if (!session) if (!session)
return -EINVAL; return -EINVAL;
if (!args->flags) {
clk_domains = nvgpu_clk_arb_get_arbiter_clk_domains(g); clk_domains = nvgpu_clk_arb_get_arbiter_clk_domains(g);
num_domains = hweight_long(clk_domains); num_domains = hweight_long(clk_domains);
if (!args->flags) {
if (!args->num_entries) { if (!args->num_entries) {
args->num_entries = num_domains; args->num_entries = num_domains;
return 0; return 0;
@@ -1073,18 +1078,21 @@ static int nvgpu_gpu_clk_get_info(struct gk20a *g,
return -EINVAL; return -EINVAL;
args->num_entries = 0; args->num_entries = 0;
num_entries = num_domains;
} else { } else {
if (args->flags != NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS) if (args->flags != NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS)
return -EINVAL; return -EINVAL;
num_domains = args->num_entries; num_entries = args->num_entries;
if (num_entries > num_domains * 3)
return -EINVAL;
} }
entry = (struct nvgpu_gpu_clk_info __user *) entry = (struct nvgpu_gpu_clk_info __user *)
(uintptr_t)args->clk_info_entries; (uintptr_t)args->clk_info_entries;
for (i = 0; i < num_domains; i++, entry++) { for (i = 0; i < num_entries; i++, entry++) {
if (args->flags == NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS) { if (args->flags == NVGPU_GPU_CLK_FLAG_SPECIFIC_DOMAINS) {
if (copy_from_user(&clk_info, (void __user *)entry, if (copy_from_user(&clk_info, (void __user *)entry,
@@ -1125,7 +1133,7 @@ static int nvgpu_gpu_clk_get_info(struct gk20a *g,
return -EFAULT; return -EFAULT;
} }
args->num_entries = num_domains; args->num_entries = num_entries;
return 0; return 0;
} }