[Patch] statistics: fix buffer overflow in histogram with linear scale
- From: Martin Peschke <mp3@xxxxxxxxxx>
- Date: Fri, 20 Oct 2006 15:58:44 +0200
Values outside the range covered by a histogram with linear
scale resulted in invalid indices pointing to non-existing
'buckets'. Index is adjusted to array boundaries, if required.
Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx>
---
statistic.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff -urp a/lib/statistic.c b/lib/statistic.c
--- a/lib/statistic.c 2006-10-08 23:03:56.000000000 +0200
+++ b/lib/statistic.c 2006-10-12 19:38:08.000000000 +0200
@@ -994,9 +994,12 @@ static s64 statistic_histogram_calc_valu
static int statistic_histogram_calc_index_lin(struct statistic *stat, s64 value)
{
- unsigned long long i = value - stat->u.histogram.range_min;
+ unsigned long long i;
+ if (value <= stat->u.histogram.range_min)
+ return 0;
+ i = value - stat->u.histogram.range_min;
do_div(i, stat->u.histogram.base_interval);
- return i;
+ return min(i, (unsigned long long)(stat->u.histogram.last_index));
}
static int statistic_histogram_calc_index_log2(struct statistic *stat,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- Re: [Patch] statistics: fix buffer overflow in histogram with linear scale
- From: Andrew Morton
- Re: [Patch] statistics: fix buffer overflow in histogram with linear scale
- Prev by Date: Re: Correct way to format spufs file output.
- Next by Date: Re: kernel BUG in __cache_alloc_node at linux-2.6.git/mm/slab.c:3177!
- Previous by thread: [PATCH] PA-RISC: Fix bogus warnings from modpost
- Next by thread: Re: [Patch] statistics: fix buffer overflow in histogram with linear scale
- Index(es):