diff options
author | Ingo Molnar | 2010-06-08 19:15:37 +0200 |
---|---|---|
committer | Ingo Molnar | 2010-06-08 19:15:37 +0200 |
commit | 84bb671dc46d77d665d2b5e74539e81b2129bb3e (patch) | |
tree | 0917b00c767bfd52bd67897dcb53a4e200d65278 | |
parent | perf: Fix signed comparison in perf_adjust_period() (diff) | |
parent | powerpc/oprofile: fix potential buffer overrun in op_model_cell.c (diff) | |
download | kernel-qcow2-linux-84bb671dc46d77d665d2b5e74539e81b2129bb3e.tar.gz kernel-qcow2-linux-84bb671dc46d77d665d2b5e74539e81b2129bb3e.tar.xz kernel-qcow2-linux-84bb671dc46d77d665d2b5e74539e81b2129bb3e.zip |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
-rw-r--r-- | arch/powerpc/oprofile/op_model_cell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index 2c9e52267292..7fd90d02d8c6 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c @@ -1077,7 +1077,7 @@ static int calculate_lfsr(int n) index = ENTRIES-1; /* make sure index is valid */ - if ((index > ENTRIES) || (index < 0)) + if ((index >= ENTRIES) || (index < 0)) index = ENTRIES-1; return initial_lfsr[index]; |