X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=014bfc57020478d3b9a647cffae8741068b38616;hp=e3f6fb04d03ff15da2777fdeb08d58021761f506;hb=0ed6086affa15e1537da1b16d2ab3af654713a15;hpb=9032d048555cb5b86ff8c1b4319a856b43331377 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index e3f6fb0..014bfc5 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -44,12 +44,22 @@ unsigned int yaffs_wr_attempts; /* * Handle management. * There are open inodes in yaffsfs_Inode. - * There are open handles in yaffsfs_Handle. + * There are open file descriptors in yaffsfs_FileDes. + * There are open handles in yaffsfs_FileDes. * * Things are structured this way to be like the Linux VFS model * so that interactions with the yaffs guts calls are similar. * That means more common code paths and less special code. * That means better testing etc. + * + * We have 3 layers because: + * A handle is different than an fd because you can use dup() + * to create a new handle that accesses the *same* fd. The two + * handles will use the same offset (part of the fd). We only close + * down the fd when there are no more handles accessing it. + * + * More than one fd can currently access one file, but each fd + * has its own permsiions and offset. */ typedef struct { @@ -64,16 +74,23 @@ typedef struct{ u8 shareRead:1; u8 shareWrite:1; int inodeId:12; /* Index to corresponding yaffsfs_Inode */ - int useCount:10; /* Use count for this handle */ - u32 position; /* current position in file */ -}yaffsfs_Handle; + int handleCount:10; /* Number of handles for this fd */ + loff_t position; /* current position in file */ +}yaffsfs_FileDes; + +typedef struct { + short int fdId; + short int useCount; +} yaffsfs_Handle; static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES]; +static yaffsfs_FileDes yaffsfs_fd[YAFFSFS_N_HANDLES]; static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES]; + static int yaffsfs_handlesInitialised; -unsigned yaffs_set_trace(unsigned tm) +unsigned yaffs_set_trace(unsigned tm) { yaffs_trace_mask = tm; return yaffs_trace_mask; @@ -96,32 +113,46 @@ static void yaffsfs_InitHandles(void) return; memset(yaffsfs_inode,0,sizeof(yaffsfs_inode)); + memset(yaffsfs_fd,0,sizeof(yaffsfs_fd)); memset(yaffsfs_handle,0,sizeof(yaffsfs_handle)); + for(i = 0; i < YAFFSFS_N_HANDLES; i++) - yaffsfs_handle[i].inodeId = -1; + yaffsfs_fd[i].inodeId = -1; + for(i = 0; i < YAFFSFS_N_HANDLES; i++) + yaffsfs_handle[i].fdId = -1; } -yaffsfs_Handle *yaffsfs_GetHandlePointer(int h) +static yaffsfs_Handle *yaffsfs_HandleToPointer(int h) { - if(h < 0 || h >= YAFFSFS_N_HANDLES) - return NULL; + if(h >= 0 && h <= YAFFSFS_N_HANDLES) + return &yaffsfs_handle[h]; + return NULL; +} + +static yaffsfs_FileDes *yaffsfs_HandleToFileDes(int handle) +{ + yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle); + + if(h && h->useCount > 0 && h->fdId >= 0 && h->fdId < YAFFSFS_N_HANDLES) + return &yaffsfs_fd[h->fdId]; - return &yaffsfs_handle[h]; + return NULL; } -yaffsfs_Inode *yaffsfs_GetInodePointer(int handle) +static yaffsfs_Inode *yaffsfs_HandleToInode(int handle) { - yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); + yaffsfs_FileDes *fd = yaffsfs_HandleToFileDes(handle); - if(h && h->useCount > 0 && h->inodeId >= 0 && h->inodeId < YAFFSFS_N_HANDLES) - return &yaffsfs_inode[h->inodeId]; + if(fd && fd->handleCount > 0 && + fd->inodeId >= 0 && fd->inodeId < YAFFSFS_N_HANDLES) + return &yaffsfs_inode[fd->inodeId]; return NULL; } -struct yaffs_obj *yaffsfs_GetHandleObject(int handle) +static struct yaffs_obj *yaffsfs_HandleToObject(int handle) { - yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle); + yaffsfs_Inode *in = yaffsfs_HandleToInode(handle); if(in) return in->iObj; @@ -138,7 +169,7 @@ static int yaffsfs_FindInodeIdForObject(struct yaffs_obj *obj) { int i; int ret = -1; - + if(obj) obj = yaffs_get_equivalent_obj(obj); @@ -159,7 +190,7 @@ static int yaffsfs_GetInodeIdForObject(struct yaffs_obj *obj) int i; int ret; yaffsfs_Inode *in = NULL; - + if(obj) obj = yaffs_get_equivalent_obj(obj); @@ -177,8 +208,8 @@ static int yaffsfs_GetInodeIdForObject(struct yaffs_obj *obj) in->iObj = obj; in->count++; } - - + + return ret; } @@ -196,12 +227,12 @@ static int yaffsfs_CountHandles(struct yaffs_obj *obj) static void yaffsfs_ReleaseInode(yaffsfs_Inode *in) { struct yaffs_obj *obj; - + obj = in->iObj; if(obj->unlinked) yaffs_del_obj(obj); - + obj->my_inode = NULL; in->iObj = NULL; @@ -216,47 +247,71 @@ static void yaffsfs_PutInode(int inodeId) yaffsfs_ReleaseInode(in); in->count = 0; } - } + } } -/* - * yaffsfs_GetHandle - * Grab a handle (when opening a file) - */ -static int yaffsfs_GetNewHandle(void) +static int yaffsfs_NewHandle(yaffsfs_Handle **hptr) { int i; yaffsfs_Handle *h; for(i = 0; i < YAFFSFS_N_HANDLES; i++){ - h = yaffsfs_GetHandlePointer(i); - if(!h){ - /* todo bug: should never happen */ - } + h = &yaffsfs_handle[i]; if(h->useCount < 1){ memset(h,0,sizeof(yaffsfs_Handle)); - h->inodeId=-1; + h->fdId=-1; h->useCount=1; + if(hptr) + *hptr = h; return i; } } return -1; } +static int yaffsfs_NewHandleAndFileDes(void) +{ + int i; + yaffsfs_FileDes *fd; + yaffsfs_Handle *h = NULL; + int handle = yaffsfs_NewHandle(&h); + + if(handle < 0) + return -1; + + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ + fd = &yaffsfs_fd[i]; + if(fd->handleCount < 1){ + memset(fd,0,sizeof(yaffsfs_FileDes)); + fd->inodeId=-1; + fd->handleCount=1; + h->fdId = i; + return handle; + } + } + + /* Dump the handle because we could not get a fd */ + h->useCount = 0; + return -1; +} + /* * yaffs_get_handle * Increase use of handle when reading/writing a file + * Also gets the file descriptor. */ + static int yaffsfs_GetHandle(int handle) { - yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); + yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle); - if(h && h->useCount > 0){ + if(h && h->useCount > 0){ h->useCount++; + return 0; } - return 0; + return -1; } /* @@ -264,34 +319,57 @@ static int yaffsfs_GetHandle(int handle) * Let go of a handle when closing a file or aborting an open or * ending a read or write. */ + +static int yaffsfs_PutFileDes(int fdId) +{ + yaffsfs_FileDes *fd; + + if(fdId >= 0 && fdId < YAFFSFS_N_HANDLES){ + fd = &yaffsfs_fd[fdId]; + fd->handleCount--; + if(fd->handleCount < 1){ + if(fd->inodeId >= 0){ + yaffsfs_PutInode(fd->inodeId); + fd->inodeId = -1; + } + } + } + return 0; +} static int yaffsfs_PutHandle(int handle) { - yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); + yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle); - if(h && h->useCount > 0){ + if(h && h->useCount > 0){ h->useCount--; if(h->useCount < 1){ - if(h->inodeId >= 0){ - yaffsfs_PutInode(h->inodeId); - h->inodeId = -1; - } + yaffsfs_PutFileDes(h->fdId); + h->fdId = -1; } } + return 0; } static void yaffsfs_BreakDeviceHandles(struct yaffs_dev *dev) { + yaffsfs_FileDes *fd; yaffsfs_Handle *h; struct yaffs_obj *obj; int i; for(i = 0; i < YAFFSFS_N_HANDLES; i++){ - h = yaffsfs_GetHandlePointer(i); - obj = yaffsfs_GetHandleObject(i); - if(h && h->useCount>0 && obj && obj->my_dev == dev){ + h = yaffsfs_HandleToPointer(i); + fd = yaffsfs_HandleToFileDes(i); + obj = yaffsfs_HandleToObject(i); + if(h && h->useCount > 0){ h->useCount = 0; - yaffsfs_PutInode(h->inodeId); - h->inodeId = -1; + h->fdId = 0; + } + if(fd && fd->handleCount>0 && obj && obj->my_dev == dev){ + + fd->handleCount = 0; + yaffsfs_PutInode(fd->inodeId); + fd->inodeId = -1; } } } @@ -325,10 +403,10 @@ int yaffsfs_IsPathDivider(YCHAR ch) int yaffsfs_CheckNameLength(const char *name) { - int retVal = 0; + int retVal = 0; + + int nameLength = strnlen(name,YAFFS_MAX_NAME_LENGTH+1); - int nameLength = yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH+1); - if(nameLength == 0){ yaffsfs_SetError(-ENOENT); retVal = -1; @@ -337,7 +415,7 @@ int yaffsfs_CheckNameLength(const char *name) retVal = -1; } - return retVal; + return retVal; } @@ -360,9 +438,9 @@ static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path) * Curveball: Need to handle multiple path dividers: * eg. /foof/sdfse///// -> /foo/sdfse */ - if(path_length > 0 && + if(path_length > 0 && yaffsfs_IsPathDivider(path[path_length-1])){ - alt_path = YMALLOC(path_length + 1); + alt_path = kmalloc(path_length + 1, 0); if(!alt_path) return -1; strcpy(alt_path, path); @@ -468,7 +546,7 @@ static int yaffsfs_CheckPath(const YCHAR *path) n++; path++; } - + return (*path) ? -1 : 0; } @@ -572,24 +650,22 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, /* got to the end of the string */ return dir; else{ - if(yaffs_strcmp(str,_Y(".")) == 0) - { + if(strcmp(str,_Y(".")) == 0){ /* Do nothing */ - } - else if(yaffs_strcmp(str,_Y("..")) == 0) + } else if(strcmp(str,_Y("..")) == 0) { dir = dir->parent; - else{ + } else{ dir = yaffs_find_by_name(dir,str); dir = yaffsfs_FollowLink(dir,symDepth,loop); - if(dir && dir->variant_type != + if(dir && dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY){ if(notDir) *notDir = 1; dir = NULL; } - + } } } @@ -635,31 +711,35 @@ static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relDir, } -int yaffs_dup(int fd) +/************************************************************************* + * Start of yaffsfs visible functions. + *************************************************************************/ + +int yaffs_dup(int handle) { - int newHandle = -1; - yaffsfs_Handle *oldPtr = NULL; - yaffsfs_Handle *newPtr = NULL; + int newHandleNumber = -1; + yaffsfs_FileDes *existingFD = NULL; + yaffsfs_Handle *existingHandle = NULL; + yaffsfs_Handle *newHandle = NULL; yaffsfs_Lock(); - - oldPtr = yaffsfs_GetHandlePointer(fd); - if(oldPtr && oldPtr->useCount > 0) - newHandle = yaffsfs_GetNewHandle(); - if(newHandle >= 0) - newPtr = yaffsfs_GetHandlePointer(newHandle); - - if(newPtr){ - *newPtr = *oldPtr; - return newHandle; + existingHandle = yaffsfs_HandleToPointer(handle); + existingFD = yaffsfs_HandleToFileDes(handle); + if(existingFD) + newHandleNumber = yaffsfs_NewHandle(&newHandle); + if(newHandle){ + newHandle->fdId = existingHandle->fdId; + existingFD->handleCount++; } - if(!oldPtr) + yaffsfs_Unlock(); + + if(!existingFD) yaffsfs_SetError(-EBADF); - else + else if (!newHandle) yaffsfs_SetError(-ENOMEM); - return -1; + return newHandleNumber; } @@ -671,7 +751,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) struct yaffs_obj *dir = NULL; YCHAR *name; int handle = -1; - yaffsfs_Handle *yh = NULL; + yaffsfs_FileDes *fd = NULL; int openDenied = 0; int symDepth = 0; int errorReported = 0; @@ -687,6 +767,11 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) int notDir = 0; int loop = 0; + if(!path) { + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -709,14 +794,14 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) yaffsfs_Lock(); - handle = yaffsfs_GetNewHandle(); + handle = yaffsfs_NewHandleAndFileDes(); if(handle < 0){ yaffsfs_SetError(-ENFILE); errorReported = 1; } else { - yh = yaffsfs_GetHandlePointer(handle); + fd = yaffsfs_HandleToFileDes(handle); /* try to find the exisiting object */ obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL); @@ -756,6 +841,13 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) if( writeRequested && !(obj->yst_mode & S_IWRITE)) openDenied = 1; + if( !errorReported && writeRequested && + obj->my_dev->read_only){ + openDenied = 1; + yaffsfs_SetError(-EROFS); + errorReported = 1; + } + if(openDenied && !errorReported ) { /* Error if the file exists but permissions are refused. */ yaffsfs_SetError(-EACCES); @@ -764,31 +856,32 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) /* Check sharing of an existing object. */ if(!openDenied){ - yaffsfs_Handle *hx; + yaffsfs_FileDes *fdx; int i; + sharedReadAllowed = 1; sharedWriteAllowed = 1; alreadyReading = 0; alreadyWriting = 0; for( i = 0; i < YAFFSFS_N_HANDLES; i++){ - hx = &yaffsfs_handle[i]; - if(hx->useCount > 0 && - hx->inodeId >= 0 && - yaffsfs_inode[hx->inodeId].iObj == obj){ - if(!hx->shareRead) + fdx = &yaffsfs_fd[i]; + if(fdx->handleCount > 0 && + fdx->inodeId >= 0 && + yaffsfs_inode[fdx->inodeId].iObj == obj){ + if(!fdx->shareRead) sharedReadAllowed = 0; - if(!hx->shareWrite) + if(!fdx->shareWrite) sharedWriteAllowed = 0; - if(hx->reading) + if(fdx->reading) alreadyReading = 1; - if(hx->writing) + if(fdx->writing) alreadyWriting = 1; } } - if((!sharedReadAllowed && readRequested)|| + if((!sharedReadAllowed && readRequested)|| (!shareRead && alreadyReading) || (!sharedWriteAllowed && writeRequested) || (!shareWrite && alreadyWriting)){ @@ -820,7 +913,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) if(!obj && dir && !errorReported && (oflag & O_CREAT)) { /* Let's see if we can create this file if it does not exist. */ if(dir->my_dev->read_only){ - yaffsfs_SetError(-EINVAL); + yaffsfs_SetError(-EROFS); errorReported = 1; } else obj = yaffs_create_file(dir,name,mode,0,0); @@ -843,26 +936,26 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) if(inodeId<0) { /* * Todo: Fix any problem if inodes run out, though that - * can't happen if the number of inode items >= number of handles. + * can't happen if the number of inode items >= number of handles. */ } - - yh->inodeId = inodeId; - yh->reading = readRequested; - yh->writing = writeRequested; - yh->append = (oflag & O_APPEND) ? 1 : 0; - yh->position = 0; - yh->shareRead = shareRead; - yh->shareWrite = shareWrite; + + fd->inodeId = inodeId; + fd->reading = readRequested; + fd->writing = writeRequested; + fd->append = (oflag & O_APPEND) ? 1 : 0; + fd->position = 0; + fd->shareRead = shareRead; + fd->shareWrite = shareWrite; /* Hook inode to object */ obj->my_inode = (void*) &yaffsfs_inode[inodeId]; - if((oflag & O_TRUNC) && yh->writing) + if((oflag & O_TRUNC) && fd->writing) yaffs_resize_file(obj,0); } else { yaffsfs_PutHandle(handle); - if(!errorReported) + if(!errorReported) yaffsfs_SetError(0); /* Problem */ handle = -1; } @@ -875,25 +968,26 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) int yaffs_open(const YCHAR *path, int oflag, int mode) { - return yaffs_open_sharing(path, oflag, mode, YAFFS_SHARE_READ | YAFFS_SHARE_WRITE); + return yaffs_open_sharing(path, oflag, mode, + YAFFS_SHARE_READ | YAFFS_SHARE_WRITE); } -int yaffs_Dofsync(int fd,int datasync) +int yaffs_Dofsync(int handle,int datasync) { - yaffsfs_Handle *h = NULL; - int retVal = 0; + int retVal = -1; + struct yaffs_obj *obj; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); + obj = yaffsfs_HandleToObject(handle); - if(h && h->useCount > 0) - /* flush the file */ - yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync); - else { - /* bad handle */ + if(!obj) yaffsfs_SetError(-EBADF); - retVal = -1; + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else { + yaffs_flush_file(obj,1,datasync); + retVal = 0; } yaffsfs_Unlock(); @@ -901,39 +995,39 @@ int yaffs_Dofsync(int fd,int datasync) return retVal; } -int yaffs_fsync(int fd) +int yaffs_fsync(int handle) { - return yaffs_Dofsync(fd,0); + return yaffs_Dofsync(handle,0); } -int yaffs_flush(int fd) +int yaffs_flush(int handle) { - return yaffs_fsync(fd); + return yaffs_fsync(handle); } -int yaffs_fdatasync(int fd) +int yaffs_fdatasync(int handle) { - return yaffs_Dofsync(fd,1); + return yaffs_Dofsync(handle,1); } -int yaffs_close(int fd) +int yaffs_close(int handle) { yaffsfs_Handle *h = NULL; - int retVal = 0; + struct yaffs_obj *obj = NULL; + int retVal = -1; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); + h = yaffsfs_HandleToPointer(handle); + obj = yaffsfs_HandleToObject(handle); - if(h && h->useCount > 0) { + if(!h || !obj) + yaffsfs_SetError(-EBADF); + else { /* clean up */ - yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,0); - yaffsfs_PutHandle(fd); + yaffs_flush_file(obj,1,0); + yaffsfs_PutHandle(handle); retVal = 0; - } else { - /* bad handle */ - yaffsfs_SetError(-EBADF); - retVal = -1; } yaffsfs_Unlock(); @@ -943,28 +1037,33 @@ int yaffs_close(int fd) -int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset) +int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte, int isPread, loff_t offset) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; - int pos = 0; - int startPos = 0; - int endPos = 0; + loff_t pos = 0; + loff_t startPos = 0; + loff_t endPos = 0; int nRead = 0; int nToRead = 0; int totalRead = 0; - unsigned int maxRead; + loff_t maxRead; u8 *buf = (u8 *)vbuf; + if(!vbuf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj){ + if(!fd || !obj){ /* bad handle */ yaffsfs_SetError(-EBADF); totalRead = -1; - } else if(!h->reading){ + } else if(!fd->reading){ /* Not a reading handle */ yaffsfs_SetError(-EINVAL); totalRead = -1; @@ -975,10 +1074,10 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off if(isPread) startPos = offset; else - startPos = h->position; + startPos = fd->position; pos = startPos; - + if(yaffs_get_obj_length(obj) > pos) maxRead = yaffs_get_obj_length(obj) - pos; else @@ -988,7 +1087,7 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off nbyte = maxRead; - yaffsfs_GetHandle(fd); + yaffsfs_GetHandle(handle); endPos = pos + nbyte; @@ -1004,11 +1103,11 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off if(nToRead > nbyte) nToRead = nbyte; - /* Tricky bit... + /* Tricky bit... * Need to reverify object in case the device was * unmounted in another thread. */ - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(handle); if(!obj) nRead = 0; else @@ -1024,8 +1123,8 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off nbyte-=nRead; else nbyte = 0; /* no more to read */ - - + + if(nbyte > 0){ yaffsfs_Unlock(); yaffsfs_Lock(); @@ -1033,11 +1132,11 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off } - yaffsfs_PutHandle(fd); + yaffsfs_PutHandle(handle); if(!isPread) { if(totalRead >= 0) - h->position = startPos + totalRead; + fd->position = startPos + totalRead; else yaffsfs_SetError(-EINVAL); } @@ -1050,49 +1149,57 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off } -int yaffs_read(int fd, void *buf, unsigned int nbyte) +int yaffs_read(int handle, void *buf, unsigned int nbyte) { - return yaffsfs_do_read(fd, buf, nbyte, 0, 0); + return yaffsfs_do_read(handle, buf, nbyte, 0, 0); } -int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset) +int yaffs_pread(int handle, void *buf, unsigned int nbyte, loff_t offset) { - return yaffsfs_do_read(fd, buf, nbyte, 1, offset); + return yaffsfs_do_read(handle, buf, nbyte, 1, offset); } -int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset) +int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte, int isPwrite, loff_t offset) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; - int pos = 0; - int startPos = 0; - int endPos; + loff_t pos = 0; + loff_t startPos = 0; + loff_t endPos; int nWritten = 0; int totalWritten = 0; int write_trhrough = 0; int nToWrite = 0; const u8 *buf = (const u8 *)vbuf; + if(!vbuf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj){ + if(!fd || !obj){ /* bad handle */ yaffsfs_SetError(-EBADF); totalWritten = -1; - } else if( h && obj && (!h->writing || obj->my_dev->read_only)){ + } else if(!fd->writing){ yaffsfs_SetError(-EINVAL); totalWritten=-1; + } else if(obj->my_dev->read_only){ + yaffsfs_SetError(-EROFS); + totalWritten=-1; } else { - if(h->append) + if(fd->append) startPos = yaffs_get_obj_length(obj); else if(isPwrite) startPos = offset; else - startPos = h->position; + startPos = fd->position; - yaffsfs_GetHandle(fd); + yaffsfs_GetHandle(handle); pos = startPos; endPos = pos + nbyte; @@ -1109,11 +1216,11 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, if(nToWrite > nbyte) nToWrite = nbyte; - /* Tricky bit... + /* Tricky bit... * Need to reverify object in case the device was * remounted or unmounted in another thread. */ - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(handle); if(!obj || obj->my_dev->read_only) nWritten = 0; else @@ -1141,11 +1248,11 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, } } - yaffsfs_PutHandle(fd); + yaffsfs_PutHandle(handle); if(!isPwrite){ if(totalWritten > 0) - h->position = startPos + totalWritten; + fd->position = startPos + totalWritten; else yaffsfs_SetError(-EINVAL); } @@ -1161,13 +1268,13 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte) return yaffsfs_do_write(fd, buf, nbyte, 0, 0); } -int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offset) +int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, loff_t offset) { return yaffsfs_do_write(fd, buf, nbyte, 1, offset); } -int yaffs_truncate(const YCHAR *path,off_t new_size) +int yaffs_truncate(const YCHAR *path,loff_t new_size) { struct yaffs_obj *obj = NULL; struct yaffs_obj *dir = NULL; @@ -1175,6 +1282,11 @@ int yaffs_truncate(const YCHAR *path,off_t new_size) int notDir = 0; int loop = 0; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1183,6 +1295,7 @@ int yaffs_truncate(const YCHAR *path,off_t new_size) yaffsfs_Lock(); obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); @@ -1190,58 +1303,62 @@ int yaffs_truncate(const YCHAR *path,off_t new_size) yaffsfs_SetError(-ELOOP); else if(!dir || !obj) yaffsfs_SetError(-ENOENT); + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE) yaffsfs_SetError(-EISDIR); else if(obj->my_dev->read_only) - yaffsfs_SetError(-EACCES); + yaffsfs_SetError(-EROFS); else if(new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE) yaffsfs_SetError(-EINVAL); else - result = yaffs_resize_file(obj,new_size); + result = yaffs_resize_file(obj, new_size); yaffsfs_Unlock(); return (result) ? 0 : -1; } -int yaffs_ftruncate(int fd, off_t new_size) +int yaffs_ftruncate(int handle, loff_t new_size) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; int result = 0; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj) + if(!fd || !obj) /* bad handle */ yaffsfs_SetError(-EBADF); + else if(!fd->writing) + yaffsfs_SetError(-EINVAL); else if(obj->my_dev->read_only) - yaffsfs_SetError(-EACCES); + yaffsfs_SetError(-EROFS); else if( new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE) yaffsfs_SetError(-EINVAL); else /* resize the file */ - result = yaffs_resize_file(obj,new_size); + result = yaffs_resize_file(obj, new_size); yaffsfs_Unlock(); return (result) ? 0 : -1; } -off_t yaffs_lseek(int fd, off_t offset, int whence) +loff_t yaffs_lseek(int handle, loff_t offset, int whence) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; - int pos = -1; - int fSize = -1; + loff_t pos = -1; + loff_t fSize = -1; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj) + if(!fd || !obj) yaffsfs_SetError(-EBADF); else if(offset > YAFFS_MAX_FILE_SIZE) yaffsfs_SetError(-EINVAL); @@ -1250,16 +1367,16 @@ off_t yaffs_lseek(int fd, off_t offset, int whence) if(offset >= 0) pos = offset; } else if(whence == SEEK_CUR) { - if( (h->position + offset) >= 0) - pos = (h->position + offset); + if( (fd->position + offset) >= 0) + pos = (fd->position + offset); } else if(whence == SEEK_END) { fSize = yaffs_get_obj_length(obj); if(fSize >= 0 && (fSize + offset) >= 0) pos = fSize + offset; - } + } if(pos >= 0 && pos <= YAFFS_MAX_FILE_SIZE) - h->position = pos; + fd->position = pos; else{ yaffsfs_SetError(-EINVAL); pos = -1; @@ -1281,6 +1398,11 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) int notDir = 0; int loop = 0; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1297,12 +1419,12 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) yaffsfs_SetError(-ELOOP); else if(!dir) yaffsfs_SetError(-ENOENT); - else if(yaffs_strncmp(name,_Y("."),2) == 0) + else if(strncmp(name,_Y("."),2) == 0) yaffsfs_SetError(-EINVAL); else if(!obj) yaffsfs_SetError(-ENOENT); else if(obj->my_dev->read_only) - yaffsfs_SetError(-EINVAL); + yaffsfs_SetError(-EROFS); else if(!isDirectory && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) yaffsfs_SetError(-EISDIR); else if(isDirectory && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) @@ -1344,7 +1466,13 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) YCHAR *alt_newpath=NULL; - if(yaffsfs_CheckPath(newPath) < 0){ + if(!oldPath || !newPath){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(oldPath) < 0 || + yaffsfs_CheckPath(newPath) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; } @@ -1364,7 +1492,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL,NULL,NULL); newobj = yaffsfs_FindObject(NULL,newPath,0,0,NULL,NULL,NULL); - /* If the object being renamed is a directory and the + /* If the object being renamed is a directory and the * path ended with a "/" then the olddir == obj. * We pass through NULL for the old name to tell the lower layers * to use olddir as the object. @@ -1379,7 +1507,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) } else if(oldLoop || newLoop) { yaffsfs_SetError(-ELOOP); rename_allowed = 0; - } else if (olddir && oldname && yaffs_strncmp(oldname, _Y("."),2) == 0){ + } else if (olddir && oldname && strncmp(oldname, _Y("."),2) == 0){ yaffsfs_SetError(-EINVAL); rename_allowed = 0; }else if(!olddir || !newdir || !obj) { @@ -1399,7 +1527,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) /* * It is a directory, check that it is not being renamed to * being its own decendent. - * Do this by tracing from the new directory back to the root, + * Do this by tracing from the new directory back to the root, * checking for obj */ @@ -1420,7 +1548,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) yaffsfs_Unlock(); if(alt_newpath) - YFREE(alt_newpath); + kfree(alt_newpath); return (result == YAFFS_FAIL) ? -1 : 0; } @@ -1476,6 +1604,11 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d int notDir = 0; int loop = 0; + if(!path || !buf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1519,8 +1652,13 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf) int retVal = -1; + if(!buf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj) retVal = yaffsfs_DoStat(obj,buf); @@ -1533,11 +1671,101 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf) return retVal; } +static int yaffsfs_DoUtime(struct yaffs_obj *obj,const struct yaffs_utimbuf *buf) +{ + int retVal = -1; + int result; + + struct yaffs_utimbuf local; + + obj = yaffs_get_equivalent_obj(obj); + + if(obj && obj->my_dev->read_only) { + yaffsfs_SetError(-EROFS); + return -1; + } + + + if(!buf){ + local.actime = Y_CURRENT_TIME; + local.modtime = local.actime; + buf = &local; + } + + if(obj){ + obj->yst_atime = buf->actime; + obj->yst_mtime = buf->modtime; + obj->dirty = 1; + result = yaffs_flush_file(obj,0,0); + retVal = result == YAFFS_OK ? 0 : -1; + } + + return retVal; +} + +int yaffs_utime(const YCHAR *path, const struct yaffs_utimbuf *buf) +{ + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int retVal = -1; + int notDir = 0; + int loop = 0; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + yaffsfs_Lock(); + + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else + retVal = yaffsfs_DoUtime(obj,buf); + + yaffsfs_Unlock(); + + return retVal; + +} +int yaffs_futime(int fd, const struct yaffs_utimbuf *buf) +{ + struct yaffs_obj *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_HandleToObject(fd); + + if(obj) + retVal = yaffsfs_DoUtime(obj,buf); + else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} + + #ifndef CONFIG_YAFFS_WINCE /* xattrib functions */ -static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow) +static int yaffs_do_setxattr(const YCHAR *path, const char *name, + const void *data, int size, int flags, int follow) { struct yaffs_obj *obj; struct yaffs_obj *dir; @@ -1546,6 +1774,11 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *da int retVal = -1; + if(!path || !name || !data){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1558,11 +1791,11 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *da if(follow) obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir && notDir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(loop) + else if(loop) yaffsfs_SetError(-ELOOP); - else if(!dir || !obj) + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_set_xattrib(obj,name,data,size,flags); @@ -1596,10 +1829,15 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl int retVal = -1; + if(!name || !data){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); - if(!obj) + if(!obj) yaffsfs_SetError(-EBADF); else { retVal = yaffs_set_xattrib(obj,name,data,size,flags); @@ -1622,6 +1860,11 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, in int notDir = 0; int loop = 0; + if(!path || !name || !data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1634,11 +1877,11 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, in if(follow) obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir && notDir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(loop) + else if(loop) yaffsfs_SetError(-ELOOP); - else if(!dir || !obj) + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_get_xattrib(obj,name,data,size); @@ -1670,8 +1913,13 @@ int yaffs_fgetxattr(int fd, const char *name, void *data, int size) int retVal = -1; + if(!name || !data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj) { retVal = yaffs_get_xattrib(obj,name,data,size); @@ -1696,6 +1944,11 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follo int notDir = 0; int loop = 0; + if(!path || !data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1708,11 +1961,11 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follo if(follow) obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir && notDir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(loop) + else if(loop) yaffsfs_SetError(-ELOOP); - else if(!dir || !obj) + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_list_xattrib(obj, data,size); @@ -1744,8 +1997,13 @@ int yaffs_flistxattr(int fd, char *data, int size) int retVal = -1; + if(!data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj) { retVal = yaffs_list_xattrib(obj,data,size); @@ -1770,6 +2028,11 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) int loop = 0; int retVal = -1; + if(!path || !name){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1782,11 +2045,11 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) if(follow) obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir && notDir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(loop) + else if(loop) yaffsfs_SetError(-ELOOP); - else if(!dir || !obj) + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_remove_xattrib(obj,name); @@ -1818,8 +2081,13 @@ int yaffs_fremovexattr(int fd, const char *name) int retVal = -1; + if(!name){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj){ retVal = yaffs_remove_xattrib(obj,name); @@ -1845,7 +2113,7 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned * int retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj){ @@ -1866,17 +2134,17 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned * retVal = 0; } else /* bad handle */ - yaffsfs_SetError(-EBADF); - + yaffsfs_SetError(-EBADF); + yaffsfs_Unlock(); - + return retVal; } -int yaffs_set_wince_times(int fd, - const unsigned *wctime, - const unsigned *watime, +int yaffs_set_wince_times(int fd, + const unsigned *wctime, + const unsigned *watime, const unsigned *wmtime) { struct yaffs_obj *obj; @@ -1884,7 +2152,7 @@ int yaffs_set_wince_times(int fd, int retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj){ @@ -1941,6 +2209,11 @@ int yaffs_access(const YCHAR *path, int amode) int loop = 0; int retval = -1; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -1956,13 +2229,15 @@ int yaffs_access(const YCHAR *path, int amode) obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir && notDir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(loop) + else if(loop) yaffsfs_SetError(-ELOOP); - else if(!dir || !obj) + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); - else { + else if((amode & W_OK) && obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else{ int access_ok = 1; if((amode & R_OK) && !(obj->yst_mode & S_IREAD)) @@ -1993,6 +2268,11 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) int notDir = 0; int loop = 0; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -2006,12 +2286,13 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) yaffsfs_Lock(); obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir && notDir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(loop) + else if(loop) yaffsfs_SetError(-ELOOP); - else if(!dir || !obj) + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else if(obj->my_dev->read_only) yaffsfs_SetError(-EROFS); @@ -2036,7 +2317,7 @@ int yaffs_fchmod(int fd, mode_t mode) } yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(!obj) yaffsfs_SetError(-EBADF); @@ -2060,6 +2341,11 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) int notDir = 0; int loop = 0; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -2071,7 +2357,7 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) } if(alt_path) path = alt_path; - + yaffsfs_Lock(); parent = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); if(!parent && notDir) @@ -2080,7 +2366,7 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) yaffsfs_SetError(-ELOOP); else if(!parent) yaffsfs_SetError(-ENOENT); - else if(yaffs_strnlen(name,5) == 0){ + else if(strnlen(name,5) == 0){ /* Trying to make the root itself */ yaffsfs_SetError(-EEXIST); } else if(parent->my_dev->read_only) @@ -2098,7 +2384,7 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) yaffsfs_Unlock(); if(alt_path) - YFREE(alt_path); + kfree(alt_path); return retVal; } @@ -2108,6 +2394,11 @@ int yaffs_rmdir(const YCHAR *path) int result; YCHAR *alt_path; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -2121,7 +2412,7 @@ int yaffs_rmdir(const YCHAR *path) path = alt_path; result = yaffsfs_DoUnlink(path,1); if(alt_path) - YFREE(alt_path); + kfree(alt_path); return result; } @@ -2134,13 +2425,18 @@ void * yaffs_getdev(const YCHAR *path) return (void *)dev; } -int yaffs_mount2(const YCHAR *path,int read_only) +int yaffs_mount_common(const YCHAR *path,int read_only, int skip_checkpt) { int retVal=-1; int result=YAFFS_FAIL; struct yaffs_dev *dev=NULL; - T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path)); + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + yaffs_trace(YAFFS_TRACE_MOUNT,"yaffs: Mounting %s",path); if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -2155,7 +2451,15 @@ int yaffs_mount2(const YCHAR *path,int read_only) if(dev){ if(!dev->is_mounted){ dev->read_only = read_only ? 1 : 0; - result = yaffs_guts_initialise(dev); + if(skip_checkpt) { + u8 skip = dev->param.skip_checkpt_rd; + dev->param.skip_checkpt_rd = 1; + result = yaffs_guts_initialise(dev); + dev->param.skip_checkpt_rd = skip; + } else { + result = yaffs_guts_initialise(dev); + } + if(result == YAFFS_FAIL) yaffsfs_SetError(-ENOMEM); retVal = result ? 0 : -1; @@ -2171,9 +2475,13 @@ int yaffs_mount2(const YCHAR *path,int read_only) } +int yaffs_mount2(const YCHAR *path, int readonly) +{ + return yaffs_mount_common(path, readonly, 0); +} int yaffs_mount(const YCHAR *path) { - return yaffs_mount2(path,0); + return yaffs_mount_common(path, 0, 0); } int yaffs_sync(const YCHAR *path) @@ -2182,28 +2490,49 @@ int yaffs_sync(const YCHAR *path) struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; } - + yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev){ - if(dev->is_mounted){ - + if(!dev->is_mounted) + yaffsfs_SetError(-EINVAL); + else if(dev->read_only) + yaffsfs_SetError(-EROFS); + else { + yaffs_flush_whole_cache(dev); yaffs_checkpoint_save(dev); retVal = 0; - - } else - yaffsfs_SetError(-EINVAL); - + + } }else yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); - return retVal; + return retVal; +} + + +static int yaffsfs_IsDevBusy(struct yaffs_dev * dev) +{ + int i; + struct yaffs_obj *obj; + + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ + obj = yaffsfs_HandleToObject(i); + if(obj && obj->my_dev == dev) + return 1; + } + return 0; } @@ -2211,7 +2540,11 @@ int yaffs_remount(const YCHAR *path, int force, int read_only) { int retVal=-1; struct yaffs_dev *dev=NULL; - yaffsfs_Handle *yh; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -2222,19 +2555,9 @@ int yaffs_remount(const YCHAR *path, int force, int read_only) dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ - int i; - int inUse; - yaffs_flush_whole_cache(dev); - for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){ - yh = & yaffsfs_handle[i]; - if(yh->useCount>0 && - yaffsfs_inode[yh->inodeId].iObj->my_dev == dev) - inUse = 1; /* the device is in use, can't unmount */ - } - - if(!inUse || force){ + if(force || ! yaffsfs_IsDevBusy(dev)){ if(read_only) yaffs_checkpoint_save(dev); dev->read_only = read_only ? 1 : 0; @@ -2259,6 +2582,11 @@ int yaffs_unmount2(const YCHAR *path, int force) int retVal=-1; struct yaffs_dev *dev=NULL; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -2268,18 +2596,10 @@ int yaffs_unmount2(const YCHAR *path, int force) dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ - int i; int inUse; - yaffs_flush_whole_cache(dev); yaffs_checkpoint_save(dev); - - for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){ - if(yaffsfs_handle[i].useCount > 0 && - yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev) - inUse = 1; /* the device is in use, can't unmount */ - } - + inUse = yaffsfs_IsDevBusy(dev); if(!inUse || force){ if(inUse) yaffsfs_BreakDeviceHandles(dev); @@ -2311,6 +2631,11 @@ loff_t yaffs_freespace(const YCHAR *path) struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -2335,6 +2660,11 @@ loff_t yaffs_totalspace(const YCHAR *path) struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -2343,7 +2673,7 @@ loff_t yaffs_totalspace(const YCHAR *path) yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev && dev->is_mounted){ - retVal = (dev->param.end_block - dev->param.start_block + 1) - + retVal = (dev->param.end_block - dev->param.start_block + 1) - dev->param.n_reserved_blocks; retVal *= dev->param.chunks_per_block; retVal *= dev->data_bytes_per_chunk; @@ -2361,6 +2691,11 @@ int yaffs_inodecount(const YCHAR *path) struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; @@ -2373,12 +2708,12 @@ int yaffs_inodecount(const YCHAR *path) if(n_obj > dev->n_hardlinks) retVal = n_obj - dev->n_hardlinks; } - + if(retVal < 0) yaffsfs_SetError(-EINVAL); - + yaffsfs_Unlock(); - return retVal; + return retVal; } @@ -2418,7 +2753,7 @@ typedef struct struct yaffs_obj *dirObj; /* ptr to directory being searched */ struct yaffs_obj *nextReturn; /* obj to be returned by next readddir */ int offset; - struct list_head others; + struct list_head others; } yaffsfs_DirectorySearchContext; @@ -2498,6 +2833,11 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) int notDir = 0; int loop = 0; + if(!dirname){ + yaffsfs_SetError(-EFAULT); + return NULL; + } + if(yaffsfs_CheckPath(dirname) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return NULL; @@ -2517,20 +2857,20 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) yaffsfs_SetError(-ENOTDIR); else { - dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext)); + dsc = kmalloc(sizeof(yaffsfs_DirectorySearchContext), 0); dir = (yaffs_DIR *)dsc; if(dsc){ memset(dsc,0,sizeof(yaffsfs_DirectorySearchContext)); dsc->magic = YAFFS_MAGIC; dsc->dirObj = obj; - yaffs_strncpy(dsc->name,dirname,NAME_MAX); + strncpy(dsc->name,dirname,NAME_MAX); INIT_LIST_HEAD(&dsc->others); if(!search_contexts.next) INIT_LIST_HEAD(&search_contexts); - list_add(&dsc->others,&search_contexts); + list_add(&dsc->others,&search_contexts); yaffsfs_SetDirRewound(dsc); } @@ -2555,10 +2895,10 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp) dsc->de.d_dont_use = (unsigned)dsc->nextReturn; dsc->de.d_off = dsc->offset++; yaffs_get_obj_name(dsc->nextReturn,dsc->de.d_name,NAME_MAX); - if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0) + if(strnlen(dsc->de.d_name,NAME_MAX+1) == 0) { /* this should not happen! */ - yaffs_strcpy(dsc->de.d_name,_Y("zz")); + strcpy(dsc->de.d_name,_Y("zz")); } dsc->de.d_reclen = sizeof(struct yaffs_dirent); retVal = &dsc->de; @@ -2591,10 +2931,15 @@ int yaffs_closedir(yaffs_DIR *dirp) { yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp; + if(!dsc){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); dsc->magic = 0; list_del(&dsc->others); /* unhook from list */ - YFREE(dsc); + kfree(dsc); yaffsfs_Unlock(); return 0; } @@ -2612,17 +2957,24 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) int notDir = 0; int loop = 0; - if(yaffsfs_CheckPath(newpath) < 0){ + if(!oldpath || !newpath){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(newpath) < 0 || + yaffsfs_CheckPath(oldpath) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; } + yaffsfs_Lock(); parent = yaffsfs_FindDirectory(NULL,newpath,&name,0,¬Dir,&loop); if(!parent && notDir) yaffsfs_SetError(-ENOTDIR); else if(loop) yaffsfs_SetError(-ELOOP); - else if( !parent || yaffs_strnlen(name,5) < 1) + else if( !parent || strnlen(name,5) < 1) yaffsfs_SetError(-ENOENT); else if(parent->my_dev->read_only) yaffsfs_SetError(-EROFS); @@ -2650,22 +3002,27 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) int notDir = 0; int loop = 0; + if(!path || !buf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); - if(!dir && notDir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(loop) + else if(loop) yaffsfs_SetError(-ELOOP); - else if(!dir || !obj) + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) yaffsfs_SetError(-EINVAL); else { YCHAR *alias = obj->variant.symlink_variant.alias; memset(buf,0,bufsiz); - yaffs_strncpy(buf,alias,bufsiz - 1); + strncpy(buf,alias,bufsiz - 1); retVal = 0; } yaffsfs_Unlock(); @@ -2686,7 +3043,13 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath) int lnkLoop = 0; YCHAR *newname; - if(yaffsfs_CheckPath(linkpath) < 0){ + if(!oldpath || !linkpath){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(linkpath) < 0 || + yaffsfs_CheckPath(oldpath) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1; } @@ -2704,14 +3067,14 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath) else if(!obj_dir || !lnk_dir || !obj) yaffsfs_SetError(-ENOENT); else if(obj->my_dev->read_only) - yaffsfs_SetError(-EINVAL); + yaffsfs_SetError(-EROFS); else if(lnk) yaffsfs_SetError(-EEXIST); else if(lnk_dir->my_dev != obj->my_dev) yaffsfs_SetError(-EXDEV); - else { + else { retVal = yaffsfs_CheckNameLength(newname); - + if(retVal == 0) { lnk = yaffs_link_obj(lnk_dir,newname,obj); if(lnk) @@ -2741,7 +3104,7 @@ int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev) /* * D E B U G F U N C T I O N S */ - + /* * yaffs_n_handles() * Returns number of handles attached to the object @@ -2750,6 +3113,11 @@ int yaffs_n_handles(const YCHAR *path) { struct yaffs_obj *obj; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); return -1;