From 69ef35ac1417ddba2d292bc22df9f54305ba9da1 Mon Sep 17 00:00:00 2001 From: "Chas Williams (CONTRACTOR)" Date: Wed, 16 Jan 2013 21:16:31 -0500 Subject: [PATCH] LINUX: fix array indexing issue in memory statistics The comma is a sequence point and i gets incremented and then used. This results in writing past the end of the array by one (and failing to initialize the first element as well). Potential fix for RT ticket 131566. Reviewed-on: http://gerrit.openafs.org/8914 Tested-by: BuildBot Reviewed-by: Simon Wilkinson Reviewed-by: Derrick Brashear (cherry picked from commit 04ddecc1f2827463edf22857f9b19910ccc25e98) Change-Id: I09a96fcb5ffc9a58f0930f76e4ee5f65628ba5c8 Reviewed-on: http://gerrit.openafs.org/9520 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand --- src/afs/LINUX/osi_alloc.c | 3 ++- src/afs/LINUX24/osi_alloc.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c index 89a7bf861..fc74a2cb5 100644 --- a/src/afs/LINUX/osi_alloc.c +++ b/src/afs/LINUX/osi_alloc.c @@ -262,7 +262,8 @@ get_hash_stats(void) afs_lhash_stat(lh_mem_htab, &afs_linux_lsb); /* clear out the bucket stat vector */ - for (i = 0; i < MAX_BUCKET_LEN; i++, afs_linux_hash_bucket_dist[i] = 0); + for (i = 0; i < MAX_BUCKET_LEN; i++) + afs_linux_hash_bucket_dist[i] = 0; cur_bucket = cur_bucket_len = 00; /* populate the bucket stat vector */ diff --git a/src/afs/LINUX24/osi_alloc.c b/src/afs/LINUX24/osi_alloc.c index d4f91cba3..62981cfe3 100644 --- a/src/afs/LINUX24/osi_alloc.c +++ b/src/afs/LINUX24/osi_alloc.c @@ -275,7 +275,8 @@ get_hash_stats(void) afs_lhash_stat(lh_mem_htab, &afs_linux_lsb); /* clear out the bucket stat vector */ - for (i = 0; i < MAX_BUCKET_LEN; i++, afs_linux_hash_bucket_dist[i] = 0); + for (i = 0; i < MAX_BUCKET_LEN; i++) + afs_linux_hash_bucket_dist[i] = 0; cur_bucket = cur_bucket_len = 00; /* populate the bucket stat vector */ -- 2.39.5