From 3687a5a7c5eea2fa08a94e59de164b2e2da3c3e2 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 31 Jan 2007 10:45:15 +0000 Subject: Do recend check before realigning on strict alignment arches, as otherwise it was comparing a stack address + offset with a mmap address. --- nscd/nscd_getserv_r.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nscd') diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c index 86242be..a725b1d 100644 --- a/nscd/nscd_getserv_r.c +++ b/nscd/nscd_getserv_r.c @@ -122,6 +122,10 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, retval = -2; goto out; } + if (__builtin_expect ((const char *) aliases_len + + serv_resp.s_aliases_cnt * sizeof (uint32_t) + > recend, 0)) + goto out; #ifndef _STRING_ARCH_unaligned /* The aliases_len array in the mapped database might very @@ -138,10 +142,6 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, * sizeof (uint32_t)); } #endif - if (__builtin_expect ((const char *) aliases_len - + serv_resp.s_aliases_cnt * sizeof (uint32_t) - > recend, 0)) - goto out; } } -- cgit v1.1