From c874523dc9fc9c384a760eb5db8c6f295185e5e3 Mon Sep 17 00:00:00 2001 From: Slawomir Mrozowicz Date: Wed, 20 Sep 2017 10:20:24 +0200 Subject: [PATCH] examples/performance-thread: fix out-of-bounds tls array Overrunning array per_lcore_this_sched->current_lthread->tls->data of 1024 8-byte elements at element index 1024 using index k. Fixed by correct check k condition. Coverity issue: 143462, 143463 Fixes: 116819b9ed0d ("examples/performance-thread: add lthread subsystem") Signed-off-by: Slawomir Mrozowicz Acked-by: Michal Jastrzebski --- examples/performance-thread/common/lthread_tls.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/performance-thread/common/lthread_tls.c b/examples/performance-thread/common/lthread_tls.c index 47505f2d42..56f0c2f1b9 100644 --- a/examples/performance-thread/common/lthread_tls.c +++ b/examples/performance-thread/common/lthread_tls.c @@ -198,11 +198,12 @@ void _lthread_tls_destroy(struct lthread *lt) void *lthread_getspecific(unsigned int k) { + void *res = NULL; - if (k > LTHREAD_MAX_KEYS) - return NULL; + if (k < LTHREAD_MAX_KEYS) + res = THIS_LTHREAD->tls->data[k]; - return THIS_LTHREAD->tls->data[k]; + return res; } /* @@ -212,7 +213,7 @@ void */ int lthread_setspecific(unsigned int k, const void *data) { - if (k > LTHREAD_MAX_KEYS) + if (k >= LTHREAD_MAX_KEYS) return POSIX_ERRNO(EINVAL); int n = THIS_LTHREAD->tls->nb_keys_inuse; -- 2.20.1