X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=2917a5d817b53d75a6772c0ba04311a495fe4ff2;hp=9f1397b578d365a0281dcb147ef0ce95a305745f;hb=f579840dc5fa33617b3c99bf184024373941066a;hpb=07353dd87a46afc753441028af8f5e8629b13bdc

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 9f1397b..2917a5d 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -74,7 +74,7 @@ struct yaffsfs_FileDes {
 	u8 shareWrite:1;
 	int inodeId:12;		/* Index to corresponding yaffsfs_Inode */
 	int handleCount:10;	/* Number of handles for this fd */
-	loff_t position;	/* current position in file */
+	Y_LOFF_T position;	/* current position in file */
 };
 
 struct yaffsfs_Handle {
@@ -394,19 +394,19 @@ static int yaffs_toupper(YCHAR a)
 		return a;
 }
 
-int yaffsfs_Match(YCHAR a, YCHAR b)
+static int yaffsfs_Match(YCHAR a, YCHAR b)
 {
 	return (yaffs_toupper(a) == yaffs_toupper(b));
 }
 #else
-int yaffsfs_Match(YCHAR a, YCHAR b)
+static int yaffsfs_Match(YCHAR a, YCHAR b)
 {
 	/* case sensitive */
 	return (a == b);
 }
 #endif
 
-int yaffsfs_IsPathDivider(YCHAR ch)
+static int yaffsfs_IsPathDivider(YCHAR ch)
 {
 	const YCHAR *str = YAFFS_PATH_DIVIDERS;
 
@@ -419,7 +419,7 @@ int yaffsfs_IsPathDivider(YCHAR ch)
 	return 0;
 }
 
-int yaffsfs_CheckNameLength(const char *name)
+static int yaffsfs_CheckNameLength(const char *name)
 {
 	int retVal = 0;
 
@@ -793,7 +793,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0)< 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1000,7 +1000,7 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
 				  YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
 }
 
-int yaffs_Dofsync(int handle, int datasync)
+static int yaffs_Dofsync(int handle, int datasync)
 {
 	int retVal = -1;
 	struct yaffs_obj *obj;
@@ -1063,21 +1063,21 @@ int yaffs_close(int handle)
 	return retVal;
 }
 
-int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte,
-		    int isPread, loff_t offset)
+static int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte,
+		    int isPread, Y_LOFF_T offset)
 {
 	struct yaffsfs_FileDes *fd = NULL;
 	struct yaffs_obj *obj = NULL;
-	loff_t pos = 0;
-	loff_t startPos = 0;
-	loff_t endPos = 0;
+	Y_LOFF_T pos = 0;
+	Y_LOFF_T startPos = 0;
+	Y_LOFF_T endPos = 0;
 	int nRead = 0;
 	int nToRead = 0;
 	int totalRead = 0;
-	loff_t maxRead;
+	Y_LOFF_T maxRead;
 	u8 *buf = (u8 *) vbuf;
 
-	if (!vbuf) {
+	if (yaffsfs_CheckMemRegion(vbuf, nbyte, 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1180,26 +1180,26 @@ int yaffs_read(int handle, void *buf, unsigned int nbyte)
 	return yaffsfs_do_read(handle, buf, nbyte, 0, 0);
 }
 
-int yaffs_pread(int handle, void *buf, unsigned int nbyte, loff_t offset)
+int yaffs_pread(int handle, void *buf, unsigned int nbyte, Y_LOFF_T offset)
 {
 	return yaffsfs_do_read(handle, buf, nbyte, 1, offset);
 }
 
-int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte,
-		     int isPwrite, loff_t offset)
+static int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte,
+		     int isPwrite, Y_LOFF_T offset)
 {
 	struct yaffsfs_FileDes *fd = NULL;
 	struct yaffs_obj *obj = NULL;
-	loff_t pos = 0;
-	loff_t startPos = 0;
-	loff_t endPos;
+	Y_LOFF_T pos = 0;
+	Y_LOFF_T startPos = 0;
+	Y_LOFF_T endPos;
 	int nWritten = 0;
 	int totalWritten = 0;
 	int write_trhrough = 0;
 	int nToWrite = 0;
 	const u8 *buf = (const u8 *)vbuf;
 
-	if (!vbuf) {
+	if (yaffsfs_CheckMemRegion(vbuf, nbyte, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1297,12 +1297,12 @@ 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, loff_t offset)
+int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, Y_LOFF_T offset)
 {
 	return yaffsfs_do_write(fd, buf, nbyte, 1, offset);
 }
 
-int yaffs_truncate(const YCHAR *path, loff_t new_size)
+int yaffs_truncate(const YCHAR *path, Y_LOFF_T new_size)
 {
 	struct yaffs_obj *obj = NULL;
 	struct yaffs_obj *dir = NULL;
@@ -1310,7 +1310,7 @@ int yaffs_truncate(const YCHAR *path, loff_t new_size)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1347,7 +1347,7 @@ int yaffs_truncate(const YCHAR *path, loff_t new_size)
 	return (result) ? 0 : -1;
 }
 
-int yaffs_ftruncate(int handle, loff_t new_size)
+int yaffs_ftruncate(int handle, Y_LOFF_T new_size)
 {
 	struct yaffsfs_FileDes *fd = NULL;
 	struct yaffs_obj *obj = NULL;
@@ -1375,12 +1375,12 @@ int yaffs_ftruncate(int handle, loff_t new_size)
 
 }
 
-loff_t yaffs_lseek(int handle, loff_t offset, int whence)
+Y_LOFF_T yaffs_lseek(int handle, Y_LOFF_T offset, int whence)
 {
 	struct yaffsfs_FileDes *fd = NULL;
 	struct yaffs_obj *obj = NULL;
-	loff_t pos = -1;
-	loff_t fSize = -1;
+	Y_LOFF_T pos = -1;
+	Y_LOFF_T fSize = -1;
 
 	yaffsfs_Lock();
 	fd = yaffsfs_HandleToFileDes(handle);
@@ -1416,7 +1416,7 @@ loff_t yaffs_lseek(int handle, loff_t offset, int whence)
 	return pos;
 }
 
-int yaffsfs_DoUnlink(const YCHAR *path, int isDirectory)
+static int yaffsfs_DoUnlink(const YCHAR *path, int isDirectory)
 {
 	struct yaffs_obj *dir = NULL;
 	struct yaffs_obj *obj = NULL;
@@ -1425,7 +1425,7 @@ int yaffsfs_DoUnlink(const YCHAR *path, int isDirectory)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1494,7 +1494,8 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 
 	YCHAR *alt_newpath = NULL;
 
-	if (!oldPath || !newPath) {
+	if (yaffsfs_CheckMemRegion(oldPath, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(newPath, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1633,7 +1634,8 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path,
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path || !buf) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(buf, sizeof(*buf), 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1681,7 +1683,7 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf)
 
 	int retVal = -1;
 
-	if (!buf) {
+	if (yaffsfs_CheckMemRegion(buf, sizeof(*buf), 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1802,7 +1804,9 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name,
 
 	int retVal = -1;
 
-	if (!path || !name || !data) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(name, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(data, size, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1858,7 +1862,8 @@ int yaffs_fsetxattr(int fd, const char *name,
 
 	int retVal = -1;
 
-	if (!name || !data) {
+	if (yaffsfs_CheckMemRegion(name, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(data, size, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1890,7 +1895,9 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name,
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path || !name || !data) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(name, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(data, size, 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1942,7 +1949,8 @@ int yaffs_fgetxattr(int fd, const char *name, void *data, int size)
 
 	int retVal = -1;
 
-	if (!name || !data) {
+	if (yaffsfs_CheckMemRegion(name, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(data, size, 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1974,7 +1982,8 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data,
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path || !data) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(data, size, 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2027,7 +2036,7 @@ int yaffs_flistxattr(int fd, char *data, int size)
 
 	int retVal = -1;
 
-	if (!data) {
+	if (yaffsfs_CheckMemRegion(data, size, 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2059,7 +2068,8 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name,
 	int loop = 0;
 	int retVal = -1;
 
-	if (!path || !name) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(name, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2112,7 +2122,7 @@ int yaffs_fremovexattr(int fd, const char *name)
 
 	int retVal = -1;
 
-	if (!name) {
+	if (yaffsfs_CheckMemRegion(name, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2236,7 +2246,7 @@ int yaffs_access(const YCHAR *path, int amode)
 	int loop = 0;
 	int retval = -1;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2294,7 +2304,7 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2366,7 +2376,7 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2420,7 +2430,7 @@ int yaffs_rmdir(const YCHAR *path)
 	int result;
 	YCHAR *alt_path;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2457,7 +2467,7 @@ int yaffs_mount_common(const YCHAR *path, int read_only, int skip_checkpt)
 	int result = YAFFS_FAIL;
 	struct yaffs_dev *dev = NULL;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2516,7 +2526,7 @@ int yaffs_sync(const YCHAR *path)
 	struct yaffs_dev *dev = NULL;
 	YCHAR *dummy;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2565,7 +2575,7 @@ int yaffs_remount(const YCHAR *path, int force, int read_only)
 	int retVal = -1;
 	struct yaffs_dev *dev = NULL;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2605,7 +2615,7 @@ int yaffs_unmount2(const YCHAR *path, int force)
 	int retVal = -1;
 	struct yaffs_dev *dev = NULL;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2648,13 +2658,13 @@ int yaffs_unmount(const YCHAR *path)
 	return yaffs_unmount2(path, 0);
 }
 
-loff_t yaffs_freespace(const YCHAR *path)
+Y_LOFF_T yaffs_freespace(const YCHAR *path)
 {
-	loff_t retVal = -1;
+	Y_LOFF_T retVal = -1;
 	struct yaffs_dev *dev = NULL;
 	YCHAR *dummy;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2677,13 +2687,13 @@ loff_t yaffs_freespace(const YCHAR *path)
 	return retVal;
 }
 
-loff_t yaffs_totalspace(const YCHAR *path)
+Y_LOFF_T yaffs_totalspace(const YCHAR *path)
 {
-	loff_t retVal = -1;
+	Y_LOFF_T retVal = -1;
 	struct yaffs_dev *dev = NULL;
 	YCHAR *dummy;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2710,11 +2720,11 @@ loff_t yaffs_totalspace(const YCHAR *path)
 
 int yaffs_inodecount(const YCHAR *path)
 {
-	loff_t retVal = -1;
+	Y_LOFF_T retVal = -1;
 	struct yaffs_dev *dev = NULL;
 	YCHAR *dummy;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2866,7 +2876,7 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!dirname) {
+	if (yaffsfs_CheckMemRegion(dirname, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return NULL;
 	}
@@ -2960,6 +2970,9 @@ void yaffs_rewinddir(yaffs_DIR *dirp)
 
 	dsc = (struct yaffsfs_DirSearchContxt *) dirp;
 
+	if (yaffsfs_CheckMemRegion(dirp, sizeof(*dsc), 0) < 0)
+		return;
+
 	yaffsfs_Lock();
 
 	yaffsfs_SetDirRewound(dsc);
@@ -2973,7 +2986,7 @@ int yaffs_closedir(yaffs_DIR *dirp)
 
 	dsc = (struct yaffsfs_DirSearchContxt *) dirp;
 
-	if (!dsc) {
+	if (yaffsfs_CheckMemRegion(dirp, sizeof(*dsc), 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2997,7 +3010,8 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!oldpath || !newpath) {
+	if (yaffsfs_CheckMemRegion(oldpath, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(newpath, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -3044,7 +3058,8 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path || !buf) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(buf, bufsiz, 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -3085,7 +3100,8 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
 	int lnkLoop = 0;
 	YCHAR *newname;
 
-	if (!oldpath || !linkpath) {
+	if (yaffsfs_CheckMemRegion(oldpath, 0, 0) < 0 ||
+	    yaffsfs_CheckMemRegion(linkpath, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -3137,9 +3153,9 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
 
 int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
 {
-	pathname = pathname;
-	mode = mode;
-	dev = dev;
+	(void) pathname;
+	(void) mode;
+	(void) dev;
 
 	yaffsfs_SetError(-EINVAL);
 	return -1;
@@ -3157,7 +3173,7 @@ int yaffs_n_handles(const YCHAR *path)
 {
 	struct yaffs_obj *obj;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -3189,7 +3205,7 @@ int yaffs_set_error(int error)
 int yaffs_dump_dev(const YCHAR *path)
 {
 #if 1
-	path = path;
+	(void) path;
 #else
 	YCHAR *rest;