From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10320 invoked by alias); 17 Aug 2011 12:08:31 -0000 Received: (qmail 10303 invoked by uid 22791); 17 Aug 2011 12:08:29 -0000 X-SWARE-Spam-Status: No, hits=-7.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 17 Aug 2011 12:08:09 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7HC89d3022806 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 17 Aug 2011 08:08:09 -0400 Received: from hase.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7HC87iK004613 for ; Wed, 17 Aug 2011 08:08:08 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Avoid executable stack in makedb X-Yow: If elected, Zippy pledges to each and every American a 55-year-old houseboy... Date: Wed, 17 Aug 2011 12:08:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-08/txt/msg00006.txt.bz2 2011-08-17 Andreas Schwab * nss/makedb.c (compute_tables): Make variables used in nested function static. --- nss/makedb.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nss/makedb.c b/nss/makedb.c index 8bbebc5..8cee92f 100644 --- a/nss/makedb.c +++ b/nss/makedb.c @@ -619,7 +619,8 @@ compute_tables (void) valstrtab[valstrlen++] = '\0'; twalk (valstrtree, copy_valstr); - for (struct database *db = databases; db != NULL; db = db->next) + static struct database *db; + for (db = databases; db != NULL; db = db->next) if (db->nentries != 0) { ++ndatabases; @@ -640,10 +641,10 @@ compute_tables (void) db->keyidxtab = db->hashtable + nhashentries_max; db->keystrtab = (char *) (db->keyidxtab + nhashentries_max); - size_t max_chainlength; - char *wp; - size_t nhashentries; - bool copy_string = false; + static size_t max_chainlength; + static char *wp; + static size_t nhashentries; + static bool copy_string; void add_key(const void *nodep, const VISIT which, const int depth) { @@ -679,6 +680,7 @@ compute_tables (void) max_chainlength = MAX (max_chainlength, chainlength); } + copy_string = false; nhashentries = nhashentries_min; for (size_t cnt = 0; cnt < TEST_RANGE; ++cnt) { -- 1.7.6 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."