system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hurd: Missing critical region locks.

Browse Source
This commit is contained in:
Samuel Thibault 2012-05-10 13:00:01 -07:00 committed by Roland McGrath
parent ecd0de9a95
commit 802ca5a5ef
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
* hurd/hurd/fd.h (_hurd_fd_get): Call HURD_CRITICAL_BEGIN/
HURD_CRITICAL_END around holding _hurd_dtable_lock.
* sysdeps/mach/hurd/dirfd (dirfd): Likewise.
* sysdeps/mach/hurd/opendir.c (_hurd_fd_opendir): Call
HURD_CRITICAL_BEGIN/HURD_CRITICAL_END around holding
d->port.lock.
* hurd/catch-signal.c (hurd_catch_signal): Use sigsetjmp/siglongjmp
instead of setjmp/longjmp to restore the signal mask. Call sigsetjmp
when handler == SIG_ERR, not when handler != SIG_ERR.

2
hurd/hurd/fd.h
View File

@ -63,6 +63,7 @@ _hurd_fd_get (int fd)
{
struct hurd_fd *descriptor;
HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_dtable_lock);
if (fd < 0 || fd >= _hurd_dtablesize)
descriptor = NULL;
@ -85,6 +86,7 @@ _hurd_fd_get (int fd)
}
}
__mutex_unlock (&_hurd_dtable_lock);
HURD_CRITICAL_END;
return descriptor;
}

5
sysdeps/mach/hurd/dirfd.c
View File

@ -1,5 +1,5 @@
/* dirfd -- Return the file descriptor used by a DIR stream. Hurd version.
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -25,6 +25,8 @@ int
dirfd (DIR *dirp)
{
int fd;
HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_dtable_lock);
for (fd = 0; fd < _hurd_dtablesize; ++fd)
if (_hurd_dtable[fd] == dirp->__fd)
@ -35,6 +37,7 @@ dirfd (DIR *dirp)
fd = -1;
}
__mutex_unlock (&_hurd_dtable_lock);
HURD_CRITICAL_END;
return fd;
}

5
sysdeps/mach/hurd/opendir.c
View File

@ -1,5 +1,4 @@
/* Copyright (C) 1993,1994,1995,1996,1997,1998,2001,2003,2005,2006
Free Software Foundation, Inc.
/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -50,9 +49,11 @@ _hurd_fd_opendir (struct hurd_fd *d)
return NULL;
/* Set the descriptor to close on exec. */
HURD_CRITICAL_BEGIN;
__spin_lock (&d->port.lock);
d->flags |= FD_CLOEXEC;
__spin_unlock (&d->port.lock);
HURD_CRITICAL_END;
dirp->__fd = d;
dirp->__data = dirp->__ptr = NULL;