Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mmap() return value validation. comment from freebsd-audit.

Browse Source
This commit is contained in:
itojun 2000-12-15 06:37:21 +00:00
parent b29180b2ff
commit 089af300b1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libintl/gettext.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gettext.c,v 1.6 2000/12/14 02:06:12 itojun Exp $ */ /* $NetBSD: gettext.c,v 1.7 2000/12/15 06:37:21 itojun Exp $ */
/*- /*-
* Copyright (c) 2000 Citrus Project, * Copyright (c) 2000 Citrus Project,
@ -28,7 +28,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: gettext.c,v 1.6 2000/12/14 02:06:12 itojun Exp $"); __RCSID("$NetBSD: gettext.c,v 1.7 2000/12/15 06:37:21 itojun Exp $");
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <sys/types.h> #include <sys/types.h>
@ -310,7 +310,8 @@ mapit(path)
int i; int i;
char *v; char *v;
if (mohandle.addr && strcmp(path, mohandle.path) == 0) if (mohandle.addr && mohandle.addr != MAP_FAILED &&
strcmp(path, mohandle.path) == 0)
return 0; /*already opened*/ return 0; /*already opened*/
unmapit(); unmapit();
@ -338,7 +339,7 @@ mapit(path)
} }
mohandle.addr = mmap(NULL, (size_t)st.st_size, PROT_READ, mohandle.addr = mmap(NULL, (size_t)st.st_size, PROT_READ,
MAP_FILE | MAP_SHARED, fd, (off_t)0); MAP_FILE | MAP_SHARED, fd, (off_t)0);
if (!mohandle.addr) { if (!mohandle.addr || mohandle.addr == MAP_FAILED) {
close(fd); close(fd);
goto fail; goto fail;
} }
@ -433,7 +434,7 @@ unmapit()
{ {
/* unmap if there's already mapped region */ /* unmap if there's already mapped region */
if (mohandle.addr) if (mohandle.addr && mohandle.addr != MAP_FAILED)
munmap(mohandle.addr, mohandle.len); munmap(mohandle.addr, mohandle.len);
mohandle.addr = NULL; mohandle.addr = NULL;
mohandle.path[0] = '\0'; mohandle.path[0] = '\0';