mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
hurd: Fix readlink() hanging on fifo
readlink() opens the target with O_READ to be able to read the symlink content. When the target is actually a fifo, that would hang waiting for a writer (caught in the coreutils testsuite). We thus have to first lookup the target without O_READ to perform io_stat and lookout for fifos, and only after checking the symlink type, we can re-lookup with O_READ.
This commit is contained in:
parent
05967faf0e
commit
9e5c991106
@ -31,7 +31,7 @@ __readlink (const char *file_name, char *buf, size_t len)
|
||||
file_t file;
|
||||
struct stat64 st;
|
||||
|
||||
file = __file_name_lookup (file_name, O_READ | O_NOLINK, 0);
|
||||
file = __file_name_lookup (file_name, O_NOLINK, 0);
|
||||
if (file == MACH_PORT_NULL)
|
||||
return -1;
|
||||
|
||||
@ -41,6 +41,9 @@ __readlink (const char *file_name, char *buf, size_t len)
|
||||
{
|
||||
char *rbuf = buf;
|
||||
|
||||
__mach_port_deallocate (__mach_task_self (), file);
|
||||
file = __file_name_lookup (file_name, O_READ | O_NOLINK, 0);
|
||||
|
||||
err = __io_read (file, &rbuf, &len, 0, len);
|
||||
if (!err && rbuf != buf)
|
||||
{
|
||||
|
@ -32,7 +32,7 @@ readlinkat (int fd, const char *file_name, char *buf, size_t len)
|
||||
file_t file;
|
||||
struct stat64 st;
|
||||
|
||||
file = __file_name_lookup_at (fd, 0, file_name, O_READ | O_NOLINK, 0);
|
||||
file = __file_name_lookup_at (fd, 0, file_name, O_NOLINK, 0);
|
||||
if (file == MACH_PORT_NULL)
|
||||
return -1;
|
||||
|
||||
@ -42,6 +42,9 @@ readlinkat (int fd, const char *file_name, char *buf, size_t len)
|
||||
{
|
||||
char *rbuf = buf;
|
||||
|
||||
__mach_port_deallocate (__mach_task_self (), file);
|
||||
file = __file_name_lookup_at (fd, 0, file_name, O_READ | O_NOLINK, 0);
|
||||
|
||||
err = __io_read (file, &rbuf, &len, 0, len);
|
||||
if (!err && rbuf != buf)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user