tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-23 13:54:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move the open/creat access checks to more efficient places.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1409 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2009-05-29 00:03:27 +00:00
parent 7b89e44274
commit 1cc33a1a5e
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
kernel/dosfns.c
View File

@ -549,6 +549,17 @@ long DosOpenSft(char FAR * fname, unsigned flags, unsigned attrib)
return sft_idx; return sft_idx;
} }
/* First test the flags to see if the user has passed a valid */
/* file mode... */
if ((flags & O_ACCMODE) > 2)
return DE_INVLDACC;
/* NEVER EVER allow directories to be created */
/* ... though FCBs are weird :) */
if (!(flags & O_FCB) &&
(attrib & ~(D_RDONLY | D_HIDDEN | D_SYSTEM | D_ARCHIVE | D_VOLID)))
return DE_ACCESS;
/* /// Added for SHARE. - Ron Cemer */ /* /// Added for SHARE. - Ron Cemer */
if (IsShareInstalled(TRUE)) if (IsShareInstalled(TRUE))
{ {
@ -560,31 +571,10 @@ long DosOpenSft(char FAR * fname, unsigned flags, unsigned attrib)
/* /// End of additions for SHARE. - Ron Cemer */ /* /// End of additions for SHARE. - Ron Cemer */
/* NEVER EVER allow directories to be created */
/* ... though FCBs are weird :) */
if (!(flags & O_FCB) &&
(attrib & ~(D_RDONLY | D_HIDDEN | D_SYSTEM | D_ARCHIVE | D_VOLID)))
return DE_ACCESS;
sftp->sft_count++; sftp->sft_count++;
sftp->sft_flags = PriPathName[0] - 'A'; sftp->sft_flags = PriPathName[0] - 'A';
result = dos_open(PriPathName, flags, attrib, sft_idx); result = dos_open(PriPathName, flags, attrib, sft_idx);
if (result >= 0) if (result < 0)
{
if (result == S_OPENED)
{
/* Check permissions. -- JPP
(do not allow to open volume labels/directories) */
if (sftp->sft_attrib & (D_DIR | D_VOLID))
{
dos_close(sft_idx);
sftp->sft_count--;
return DE_ACCESS;
}
}
return sft_idx | ((long)result << 16);
}
else
{ {
/* /// Added for SHARE *** CURLY BRACES ADDED ALSO!!! ***. - Ron Cemer */ /* /// Added for SHARE *** CURLY BRACES ADDED ALSO!!! ***. - Ron Cemer */
if (IsShareInstalled(TRUE)) if (IsShareInstalled(TRUE))
@ -596,6 +586,7 @@ long DosOpenSft(char FAR * fname, unsigned flags, unsigned attrib)
sftp->sft_count--; sftp->sft_count--;
return result; return result;
} }
return sft_idx | ((long)result << 16);
} }
long DosOpen(char FAR * fname, unsigned mode, unsigned attrib) long DosOpen(char FAR * fname, unsigned mode, unsigned attrib)

14
kernel/fatfs.c
View File

@ -136,11 +136,6 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
char fcbname[FNAME_SIZE + FEXT_SIZE]; char fcbname[FNAME_SIZE + FEXT_SIZE];
int status = S_OPENED; int status = S_OPENED;
/* First test the flags to see if the user has passed a valid */
/* file mode... */
if ((flags & O_ACCMODE) > 2)
return DE_INVLDACC;
/* next split the passed dir into comopnents (i.e. - path to */ /* next split the passed dir into comopnents (i.e. - path to */
/* new directory and name of new directory. */ /* new directory and name of new directory. */
if ((fnp = split_path(path, fcbname, sft_to_fnode(fd))) == NULL) if ((fnp = split_path(path, fcbname, sft_to_fnode(fd))) == NULL)
@ -174,9 +169,12 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
if ((flags & O_FCB) && (fnp->f_dir.dir_attrib & D_RDONLY)) if ((flags & O_FCB) && (fnp->f_dir.dir_attrib & D_RDONLY))
flags = (flags & ~3) | O_RDONLY; flags = (flags & ~3) | O_RDONLY;
/* Check permissions. -- JPP */ /* Check permissions. -- JPP
if ((fnp->f_dir.dir_attrib & D_RDONLY) && (do not allow to open volume labels/directories,
((flags & O_ACCMODE) != O_RDONLY)) and do not allow writing to r/o files) */
if ((fnp->f_dir.dir_attrib & (D_DIR | D_VOLID)) ||
((fnp->f_dir.dir_attrib & D_RDONLY) &&
((flags & O_ACCMODE) != O_RDONLY)))
{ {
dir_close(fnp); dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;