
We turn on a few extra warnings and fix the fallout that occurs when building with --enable-developer. Note that we get different warnings on different machines and so this will be a work in progress. So far, we have built on NetBSD/amd64 5.99.64 (which uses gcc 4.5.3) and Ubuntu 10.04.3 LTS (which uses gcc 4.4.3). Notably, we fixed 1. a lot of missing structure initialisers, 2. unchecked return values for functions that glibc marks as __attribute__((warn-unused-result)), 3. made minor modifications to slc and asn1_compile which can generate code which generates warnings, and 4. a few stragglers here and there. We turned off the extended warnings for many programs in appl/ as they are nearing the end of their useful lifetime, e.g. rsh, rcp, popper, ftp and telnet. Interestingly, glibc's strncmp() macro needed to be worked around whereas the function calls did not. We have not yet tried this on 32 bit platforms, so there will be a few more warnings when we do.
216 lines
5.0 KiB
C
216 lines
5.0 KiB
C
/*
|
|
* Copyright (c) 1999 - 2004 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ifdef HAVE_SYS_MMAN_H
|
|
#include <sys/mman.h>
|
|
#endif
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <err.h>
|
|
#include "roken.h"
|
|
|
|
#include "test-mem.h"
|
|
|
|
/* #undef HAVE_MMAP */
|
|
|
|
struct {
|
|
void *start;
|
|
size_t size;
|
|
void *data_start;
|
|
size_t data_size;
|
|
enum rk_test_mem_type type;
|
|
int fd;
|
|
} map;
|
|
|
|
#ifdef HAVE_SIGACTION
|
|
|
|
struct sigaction sa, osa;
|
|
|
|
#else
|
|
|
|
void (* osigh)(int);
|
|
|
|
#endif
|
|
|
|
char *testname;
|
|
|
|
static RETSIGTYPE
|
|
segv_handler(int sig)
|
|
{
|
|
int fd;
|
|
ssize_t ret;
|
|
char msg[] = "SIGSEGV i current test: ";
|
|
|
|
fd = open("/dev/stdout", O_WRONLY, 0600);
|
|
if (fd >= 0) {
|
|
ret = write(fd, msg, sizeof(msg) - 1);
|
|
if (ret != -1)
|
|
ret = write(fd, testname, strlen(testname));
|
|
if (ret != -1)
|
|
ret = write(fd, "\n", 1);
|
|
close(fd);
|
|
}
|
|
_exit(1);
|
|
}
|
|
|
|
#define TESTREC() \
|
|
if (testname) \
|
|
errx(1, "test %s run recursively on %s", name, testname); \
|
|
testname = strdup(name); \
|
|
if (testname == NULL) \
|
|
errx(1, "malloc");
|
|
|
|
|
|
ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
|
|
rk_test_mem_alloc(enum rk_test_mem_type type, const char *name,
|
|
void *buf, size_t size)
|
|
{
|
|
#ifndef HAVE_MMAP
|
|
unsigned char *p;
|
|
|
|
TESTREC();
|
|
|
|
p = malloc(size + 2);
|
|
if (p == NULL)
|
|
errx(1, "malloc");
|
|
map.type = type;
|
|
map.start = p;
|
|
map.size = size + 2;
|
|
p[0] = 0xff;
|
|
p[map.size-1] = 0xff;
|
|
map.data_start = p + 1;
|
|
#else
|
|
unsigned char *p;
|
|
int flags, ret, fd;
|
|
size_t pagesize = getpagesize();
|
|
|
|
TESTREC();
|
|
|
|
map.type = type;
|
|
|
|
#ifdef MAP_ANON
|
|
flags = MAP_ANON;
|
|
fd = -1;
|
|
#else
|
|
flags = 0;
|
|
fd = open ("/dev/zero", O_RDONLY);
|
|
if(fd < 0)
|
|
err (1, "open /dev/zero");
|
|
#endif
|
|
map.fd = fd;
|
|
flags |= MAP_PRIVATE;
|
|
|
|
map.size = size + pagesize - (size % pagesize) + pagesize * 2;
|
|
|
|
p = (unsigned char *)mmap(0, map.size, PROT_READ | PROT_WRITE,
|
|
flags, fd, 0);
|
|
if (p == (unsigned char *)MAP_FAILED)
|
|
err (1, "mmap");
|
|
|
|
map.start = p;
|
|
|
|
ret = mprotect ((void *)p, pagesize, 0);
|
|
if (ret < 0)
|
|
err (1, "mprotect");
|
|
|
|
ret = mprotect (p + map.size - pagesize, pagesize, 0);
|
|
if (ret < 0)
|
|
err (1, "mprotect");
|
|
|
|
switch (type) {
|
|
case RK_TM_OVERRUN:
|
|
map.data_start = p + map.size - pagesize - size;
|
|
break;
|
|
case RK_TM_UNDERRUN:
|
|
map.data_start = p + pagesize;
|
|
break;
|
|
default:
|
|
abort();
|
|
}
|
|
#endif
|
|
#ifdef HAVE_SIGACTION
|
|
sigemptyset (&sa.sa_mask);
|
|
sa.sa_flags = 0;
|
|
#ifdef SA_RESETHAND
|
|
sa.sa_flags |= SA_RESETHAND;
|
|
#endif
|
|
sa.sa_handler = segv_handler;
|
|
sigaction (SIGSEGV, &sa, &osa);
|
|
#else
|
|
osigh = signal(SIGSEGV, segv_handler);
|
|
#endif
|
|
|
|
map.data_size = size;
|
|
if (buf)
|
|
memcpy(map.data_start, buf, size);
|
|
return map.data_start;
|
|
}
|
|
|
|
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
|
|
rk_test_mem_free(const char *map_name)
|
|
{
|
|
#ifndef HAVE_MMAP
|
|
unsigned char *p = map.start;
|
|
|
|
if (testname == NULL)
|
|
errx(1, "test_mem_free call on no free");
|
|
|
|
if (p[0] != 0xff)
|
|
errx(1, "%s: %s underrun %x\n", testname, map_name, p[0]);
|
|
if (p[map.size-1] != 0xff)
|
|
errx(1, "%s: %s overrun %x\n", testname, map_name, p[map.size - 1]);
|
|
free(map.start);
|
|
#else
|
|
int ret;
|
|
|
|
if (testname == NULL)
|
|
errx(1, "test_mem_free call on no free");
|
|
|
|
ret = munmap (map.start, map.size);
|
|
if (ret < 0)
|
|
err (1, "munmap");
|
|
if (map.fd > 0)
|
|
close(map.fd);
|
|
#endif
|
|
free(testname);
|
|
testname = NULL;
|
|
|
|
#ifdef HAVE_SIGACTION
|
|
sigaction (SIGSEGV, &osa, NULL);
|
|
#else
|
|
signal (SIGSEGV, osigh);
|
|
#endif
|
|
}
|