diff options
| author | Dimitri Sivanich <sivanich@sgi.com> | 2013-07-03 15:05:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 16:07:42 -0700 |
| commit | a7d0dabb3e863a1d4018235c1384b4318322116a (patch) | |
| tree | d3393110354289598eb661f5b573339c3a06f171 /drivers/misc/sgi-gru | |
| parent | 48a9db462d99494583dad829969616ac90a8df4e (diff) | |
| download | linux-a7d0dabb3e863a1d4018235c1384b4318322116a.tar.gz linux-a7d0dabb3e863a1d4018235c1384b4318322116a.tar.bz2 linux-a7d0dabb3e863a1d4018235c1384b4318322116a.zip | |
drivers/misc/sgi-gru/grufault.c: fix a sanity test in gru_set_context_option()
"req.val1 == -1" is valid but it doesn't make sense to check gru_base[-1].
gru_base[] is a global array.
Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Robin Holt <holt@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-gru')
| -rw-r--r-- | drivers/misc/sgi-gru/grufault.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index c4acac74725c..f74fc0ca2ef9 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -876,8 +876,9 @@ int gru_set_context_option(unsigned long arg) switch (req.op) { case sco_blade_chiplet: /* Select blade/chiplet for GRU context */ - if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || !gru_base[req.val1] || - req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) { + if (req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB || + req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || + (req.val1 >= 0 && !gru_base[req.val1])) { ret = -EINVAL; } else { gts->ts_user_blade_id = req.val1; |