aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <alex@csgraf.de>2009-05-06 02:58:48 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-05-08 15:57:33 -0500
commit8bd8199f708c41fd779e2b84a7bcc1b8cdb5b753 (patch)
treeaa9930b8354477e9acd939031cce8924278c72d2
parent2da1e398641d9fccf683645c808dee0d088f84cf (diff)
AIO deletion race fix
When deleting an fd event there is a chance the object doesn't get deleted, but only ->deleted set positive and deleted somewhere later. Now, if we create a handler for the fd again before the actual deletion occurs, we end up writing data into an object that has ->deleted set, which is obviously wrong. I see two ways to fix this: 1. Don't return ->deleted objects in the search 2. Unset ->deleted in the search This patch implements 1. which feels safer to do. It fixes AIO issues I've seen with curl, as libcurl unsets fd event listeners pretty frequently. Signed-off-by: Alexander Graf <alex@csgraf.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--aio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/aio.c b/aio.c
index 200320c979..11fbb6c0c5 100644
--- a/aio.c
+++ b/aio.c
@@ -44,7 +44,8 @@ static AioHandler *find_aio_handler(int fd)
LIST_FOREACH(node, &aio_handlers, node) {
if (node->fd == fd)
- return node;
+ if (!node->deleted)
+ return node;
}
return NULL;