X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=a26998439ccefd2f0d4fe6b2119c15e65dee3cf1;hp=d208e25df0b4fdf002bae73547caddcbc7892107;hb=93e9fdf712264bc18bad8b249e8e908494b0f774;hpb=878880321c4fa7ab0e431d22a3dd156a9a272c68

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index d208e25..a269984 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -122,6 +122,8 @@ static void yaffsfs_InitHandles(void)
 	if (yaffsfs_handlesInitialised)
 		return;
 
+	yaffsfs_handlesInitialised = 1;
+
 	memset(yaffsfs_inode, 0, sizeof(yaffsfs_inode));
 	memset(yaffsfs_fd, 0, sizeof(yaffsfs_fd));
 	memset(yaffsfs_handle, 0, sizeof(yaffsfs_handle));
@@ -501,6 +503,9 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path,
 		thisMatchLength = 0;
 		matching = 1;
 
+		if(!p)
+			continue;
+
 		while (matching && *p && *leftOver) {
 			/* Skip over any /s */
 			while (yaffsfs_IsPathDivider(*p))
@@ -793,7 +798,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;
 	}
@@ -1077,7 +1082,7 @@ static int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte,
 	Y_LOFF_T maxRead;
 	u8 *buf = (u8 *) vbuf;
 
-	if (!vbuf) {
+	if (yaffsfs_CheckMemRegion(vbuf, nbyte, 1) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1199,7 +1204,7 @@ static int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte,
 	int nToWrite = 0;
 	const u8 *buf = (const u8 *)vbuf;
 
-	if (!vbuf) {
+	if (yaffsfs_CheckMemRegion(vbuf, nbyte, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1310,7 +1315,7 @@ int yaffs_truncate(const YCHAR *path, Y_LOFF_T new_size)
 	int notDir = 0;
 	int loop = 0;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -1425,7 +1430,7 @@ static 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 +1499,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 +1639,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 +1688,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 +1809,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 +1867,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 +1900,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 +1954,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 +1987,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 +2041,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 +2073,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 +2127,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 +2251,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 +2309,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 +2381,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 +2435,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 +2472,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 +2531,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 +2580,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 +2620,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 +2663,74 @@ int yaffs_unmount(const YCHAR *path)
 	return yaffs_unmount2(path, 0);
 }
 
+int yaffs_format(const YCHAR *path,
+		int unmount_flag,
+		int force_unmount_flag,
+		int remount_flag)
+{
+	int retVal = 0;
+	struct yaffs_dev *dev = NULL;
+	int result;
+
+	if (!path) {
+		yaffsfs_SetError(-EFAULT);
+		return -1;
+	}
+
+	if (yaffsfs_CheckPath(path) < 0) {
+		yaffsfs_SetError(-ENAMETOOLONG);
+		return -1;
+	}
+
+	yaffsfs_Lock();
+	dev = yaffsfs_FindMountPoint(path);
+
+	if (dev) {
+		int was_mounted = dev->is_mounted;
+
+		if (dev->is_mounted && unmount_flag) {
+			int inUse;
+			yaffs_flush_whole_cache(dev);
+			yaffs_checkpoint_save(dev);
+			inUse = yaffsfs_IsDevBusy(dev);
+			if (!inUse || force_unmount_flag) {
+				if (inUse)
+					yaffsfs_BreakDeviceHandles(dev);
+				yaffs_deinitialise(dev);
+			}
+		}
+
+		if(dev->is_mounted) {
+				yaffsfs_SetError(-EBUSY);
+				retVal = -1;
+		} else {
+			yaffs_format_dev(dev);
+			if(was_mounted && remount_flag) {
+				result = yaffs_guts_initialise(dev);
+				if (result == YAFFS_FAIL) {
+					yaffsfs_SetError(-ENOMEM);
+					retVal = -1;
+				}
+			}
+		}
+	} else {
+		yaffsfs_SetError(-ENODEV);
+		retVal = -1;
+	}
+
+	yaffsfs_Unlock();
+	return retVal;
+
+}
+
+
 Y_LOFF_T yaffs_freespace(const YCHAR *path)
 {
 	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;
 	}
@@ -2683,7 +2759,7 @@ Y_LOFF_T yaffs_totalspace(const YCHAR *path)
 	struct yaffs_dev *dev = NULL;
 	YCHAR *dummy;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2714,7 +2790,7 @@ int yaffs_inodecount(const YCHAR *path)
 	struct yaffs_dev *dev = NULL;
 	YCHAR *dummy;
 
-	if (!path) {
+	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
 		return -1;
 	}
@@ -2866,7 +2942,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 +3036,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 +3052,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 +3076,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 +3124,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 +3166,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;
 	}
@@ -3157,7 +3239,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;
 	}