proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-25 11:08:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc: Fix error handling of mmap util functions.

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2972 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Angus Salkeld 2010-06-29 05:31:44 +00:00
parent 60f13c03a2
commit b116eaca00
2 changed files with 86 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
exec/coroipcs.c
View File

@ -254,10 +254,10 @@ memory_map (
size_t bytes,
void **buf)
{
int fd;
int32_t fd;
void *addr_orig;
void *addr;
int res;
int32_t res;
fd = open (path, O_RDWR, 0600);
@ -269,24 +269,22 @@ memory_map (
res = ftruncate (fd, bytes);
if (res == -1) {
close (fd);
return (-1);
goto error_close_unlink;
}
addr_orig = mmap (NULL, bytes, PROT_NONE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
if (addr_orig == MAP_FAILED) {
close (fd);
return (-1);
goto error_close_unlink;
}
addr = mmap (addr_orig, bytes, PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, 0);
if (addr != addr_orig) {
close (fd);
return (-1);
munmap(addr_orig, bytes);
goto error_close_unlink;
}
#ifdef COROSYNC_BSD
madvise(addr, bytes, MADV_NOSYNC);
@ -298,6 +296,11 @@ memory_map (
}
*buf = addr_orig;
return (0);
error_close_unlink:
close (fd);
unlink(path);
return -1;
}
static int
@ -306,10 +309,10 @@ circular_memory_map (
size_t bytes,
void **buf)
{
int fd;
int32_t fd;
void *addr_orig;
void *addr;
int res;
int32_t res;
fd = open (path, O_RDWR, 0600);
@ -320,24 +323,23 @@ circular_memory_map (
}
res = ftruncate (fd, bytes);
if (res == -1) {
close (fd);
return (-1);
goto error_close_unlink;
}
addr_orig = mmap (NULL, bytes << 1, PROT_NONE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
if (addr_orig == MAP_FAILED) {
close (fd);
return (-1);
munmap(addr_orig, bytes);
goto error_close_unlink;
}
addr = mmap (addr_orig, bytes, PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, 0);
if (addr != addr_orig) {
close (fd);
return (-1);
munmap(addr_orig, bytes);
goto error_close_unlink;
}
#ifdef COROSYNC_BSD
madvise(addr_orig, bytes, MADV_NOSYNC);
@ -347,8 +349,9 @@ circular_memory_map (
bytes, PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, 0);
if (addr == MAP_FAILED) {
close (fd);
return (-1);
munmap(addr_orig, bytes);
munmap(addr, bytes);
goto error_close_unlink;
}
#ifdef COROSYNC_BSD
madvise(((char *)addr_orig) + bytes, bytes, MADV_NOSYNC);
@ -356,10 +359,17 @@ circular_memory_map (
res = close (fd);
if (res) {
munmap(addr_orig, bytes);
munmap(addr, bytes);
return (-1);
}
*buf = addr_orig;
return (0);
error_close_unlink:
close (fd);
unlink(path);
return (-1);
}
static inline int

82
lib/coroipcc.c
View File

@ -40,6 +40,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <limits.h>
#include <errno.h>
#include <string.h>
#include <fcntl.h>
@ -283,16 +284,19 @@ union semun {
static int
circular_memory_map (char *path, const char *file, void **buf, size_t bytes)
{
int fd;
int32_t fd;
void *addr_orig;
void *addr;
int res;
int32_t res;
char buffer[128];
int32_t i;
int32_t written;
sprintf (path, "/dev/shm/%s", file);
snprintf (path, PATH_MAX, "/dev/shm/%s", file);
fd = mkstemp (path);
if (fd == -1) {
sprintf (path, LOCALSTATEDIR "/run/%s", file);
snprintf (path, PATH_MAX, LOCALSTATEDIR "/run/%s", file);
fd = mkstemp (path);
if (fd == -1) {
return (-1);
@ -301,24 +305,32 @@ circular_memory_map (char *path, const char *file, void **buf, size_t bytes)
res = ftruncate (fd, bytes);
if (res == -1) {
close (fd);
return (-1);
goto error_close_unlink;
}
memset (buffer, 0, sizeof (buffer));
for (i = 0; i < (bytes / 64); i++) {
retry_write:
written = write (fd, buffer, 64);
if (written == -1 && errno == EINTR) {
goto retry_write;
}
if (written != 64) {
goto error_close_unlink;
}
}
addr_orig = mmap (NULL, bytes << 1, PROT_NONE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
if (addr_orig == MAP_FAILED) {
close (fd);
return (-1);
goto error_close_unlink;
}
addr = mmap (addr_orig, bytes, PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, 0);
if (addr != addr_orig) {
close (fd);
return (-1);
goto error_close_unlink;
}
#ifdef COROSYNC_BSD
madvise(addr_orig, bytes, MADV_NOSYNC);
@ -328,8 +340,7 @@ circular_memory_map (char *path, const char *file, void **buf, size_t bytes)
bytes, PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, 0);
if (addr == MAP_FAILED) {
close (fd);
return (-1);
goto error_close_unlink;
}
#ifdef COROSYNC_BSD
madvise(((char *)addr_orig) + bytes, bytes, MADV_NOSYNC);
@ -341,6 +352,11 @@ circular_memory_map (char *path, const char *file, void **buf, size_t bytes)
}
*buf = addr_orig;
return (0);
error_close_unlink:
close (fd);
unlink(path);
return (-1);
}
static void
@ -362,19 +378,23 @@ void ipc_hdb_destructor (void *context ) {
memory_unmap (ipc_instance->response_buffer, ipc_instance->response_size);
memory_unmap (ipc_instance->dispatch_buffer, (ipc_instance->dispatch_size) << 1);
}
static int
memory_map (char *path, const char *file, void **buf, size_t bytes)
{
int fd;
int32_t fd;
void *addr_orig;
void *addr;
int res;
int32_t res;
char buffer[128];
int32_t i;
int32_t written;
sprintf (path, "/dev/shm/%s", file);
snprintf (path, PATH_MAX, "/dev/shm/%s", file);
fd = mkstemp (path);
if (fd == -1) {
sprintf (path, LOCALSTATEDIR "/run/%s", file);
snprintf (path, PATH_MAX, LOCALSTATEDIR "/run/%s", file);
fd = mkstemp (path);
if (fd == -1) {
return (-1);
@ -383,24 +403,32 @@ memory_map (char *path, const char *file, void **buf, size_t bytes)
res = ftruncate (fd, bytes);
if (res == -1) {
close (fd);
return (-1);
goto error_close_unlink;
}
memset (buffer, 0, sizeof (buffer));
for (i = 0; i < (bytes / 64); i++) {
retry_write:
written = write (fd, buffer, 64);
if (written == -1 && errno == EINTR) {
goto retry_write;
}
if (written != 64) {
goto error_close_unlink;
}
}
addr_orig = mmap (NULL, bytes, PROT_NONE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
if (addr_orig == MAP_FAILED) {
close (fd);
return (-1);
goto error_close_unlink;
}
addr = mmap (addr_orig, bytes, PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, 0);
if (addr != addr_orig) {
close (fd);
return (-1);
goto error_close_unlink;
}
#ifdef COROSYNC_BSD
madvise(addr_orig, bytes, MADV_NOSYNC);
@ -411,7 +439,13 @@ memory_map (char *path, const char *file, void **buf, size_t bytes)
return (-1);
}
*buf = addr_orig;
return (0);
return 0;
error_close_unlink:
close (fd);
unlink(path);
return -1;
}
static cs_error_t
@ -479,7 +513,7 @@ ipc_sem_wait (
#else
struct timespec timeout;
struct pollfd pfd;
sem_t *sem;
sem_t *sem = NULL;
#endif
int res;