Skip to content

P
PPSi
Commit 754a413e authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

arch-wrs: close file descriptors when failed to open shmem 

Commit copied from the WRS.

wrs_shm_get have to close file descriptors when it fails to open shmem.
Otherwise program which tries to open shmem will keep opening file descriptors.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent ed7a1381
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
arch-wrs/shmem.c
View file @ 754a413e
...@@ -61,8 +61,10 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name, ...@@ -61,8 +61,10 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name,
return NULL; /* keep errno */ return NULL; /* keep errno */
/* The file may be too short: enlarge it to the minimum size */ /* The file may be too short: enlarge it to the minimum size */
if (fstat(fd, &stbuf) < 0) if (fstat(fd, &stbuf) < 0) {
close(fd);
return NULL; /* keep errno */ return NULL; /* keep errno */
}
if (stbuf.st_size < WRS_SHM_MIN_SIZE) { if (stbuf.st_size < WRS_SHM_MIN_SIZE) {
lseek(fd, WRS_SHM_MIN_SIZE - 1, SEEK_SET); lseek(fd, WRS_SHM_MIN_SIZE - 1, SEEK_SET);
write(fd, "", 1); write(fd, "", 1);
...@@ -71,8 +73,10 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name, ...@@ -71,8 +73,10 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name,
map = mmap(0, WRS_SHM_MAX_SIZE, map = mmap(0, WRS_SHM_MAX_SIZE,
PROT_READ | (write_access ? PROT_WRITE : 0), PROT_READ | (write_access ? PROT_WRITE : 0),
MAP_SHARED, fd, 0); MAP_SHARED, fd, 0);
if (map == MAP_FAILED) if (map == MAP_FAILED) {
close(fd);
return NULL; /* keep errno */ return NULL; /* keep errno */
}
head = map; head = map;
if (!write_access) { if (!write_access) {
...@@ -94,6 +98,7 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name, ...@@ -94,6 +98,7 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name,
continue; continue;
errno = ETIMEDOUT; errno = ETIMEDOUT;
close(fd);
return NULL; return NULL;
} }
} }
...@@ -102,6 +107,7 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name, ...@@ -102,6 +107,7 @@ struct wrs_shm_head *wrs_shm_get(enum wrs_shm_name name_id, char *name,
if (head->pid && kill(head->pid, 0) == 0) { if (head->pid && kill(head->pid, 0) == 0) {
munmap(map, WRS_SHM_MAX_SIZE); munmap(map, WRS_SHM_MAX_SIZE);
errno = EBUSY; errno = EBUSY;
close(fd);
return NULL; return NULL;
} }
head->fd = fd; head->fd = fd;
...@@ -162,10 +168,14 @@ int wrs_shm_get_and_check(enum wrs_shm_name shm_name, ...@@ -162,10 +168,14 @@ int wrs_shm_get_and_check(enum wrs_shm_name shm_name,
version = (*head)->version; version = (*head)->version;
ret = wrs_shm_seqretry(*head, ii); ret = wrs_shm_seqretry(*head, ii);
if (ret) { if (ret) {
wrs_shm_put(*head);
*head = NULL;
/* inconsistent data in shmem */ /* inconsistent data in shmem */
return WRS_SHM_INCONSISTENT_DATA; return WRS_SHM_INCONSISTENT_DATA;
} }
if (!version) { if (!version) {
wrs_shm_put(*head);
*head = NULL;
/* data in shmem available and version is zero */ /* data in shmem available and version is zero */
return WRS_SHM_WRONG_VERSION; return WRS_SHM_WRONG_VERSION;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment