ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Improve parameter checks when opening a directory.

This commit is contained in:
Alexandre Julliard 2009-12-08 12:18:44 +01:00
parent 019e404938
commit 151446a2a6
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/fd.c
View File

@ -1732,7 +1732,8 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
int root_fd = -1; int root_fd = -1;
int rw_mode; int rw_mode;
if ((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) if (((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) ||
((options & FILE_DIRECTORY_FILE) && (flags & O_TRUNC)))
{ {
set_error( STATUS_INVALID_PARAMETER ); set_error( STATUS_INVALID_PARAMETER );
return NULL; return NULL;
@ -1785,9 +1786,13 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1) if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1)
{ {
/* if we tried to open a directory for write access, retry read-only */ /* if we tried to open a directory for write access, retry read-only */
if (errno != EISDIR || if (errno == EISDIR)
!(access & FILE_UNIX_WRITE_ACCESS) || {
(fd->unix_fd = open( name, O_RDONLY | (flags & ~(O_TRUNC | O_CREAT | O_EXCL)), *mode )) == -1) if ((access & FILE_UNIX_WRITE_ACCESS) || (flags & O_CREAT))
fd->unix_fd = open( name, O_RDONLY | (flags & ~(O_TRUNC | O_CREAT | O_EXCL)), *mode );
}
if (fd->unix_fd == -1)
{ {
file_set_error(); file_set_error();
goto error; goto error;
@ -1836,7 +1841,16 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
return NULL; return NULL;
} }
strcpy( closed_fd->unlink, unlink_name ); strcpy( closed_fd->unlink, unlink_name );
if (flags & O_TRUNC) ftruncate( fd->unix_fd, 0 ); if (flags & O_TRUNC)
{
if (S_ISDIR(st.st_mode))
{
release_object( fd );
set_error( STATUS_OBJECT_NAME_COLLISION );
return NULL;
}
ftruncate( fd->unix_fd, 0 );
}
} }
else /* special file */ else /* special file */
{ {