patch-2.1.20 linux/fs/open.c

• Lines: 33
• Date: Tue Dec 31 21:19:32 1996
• Orig file: v2.1.19/linux/fs/open.c
• Orig date: Tue Oct 29 19:58:44 1996

diff -u --recursive --new-file v2.1.19/linux/fs/open.c linux/fs/open.c
@@ -176,13 +176,13 @@
 	/* Don't worry, the checks are done in inode_change_ok() */
 	newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
 	if (times) {
-		error = verify_area(VERIFY_READ, times, sizeof(*times));
+		error = get_user(newattrs.ia_atime, &times->actime);
+		if (!error) 
+			error = get_user(newattrs.ia_mtime, &times->modtime);
 		if (error) {
 			iput(inode);
 			return error;
 		}
-		get_user(newattrs.ia_atime, &times->actime);
-		get_user(newattrs.ia_mtime, &times->modtime);
 		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
 	} else {
 		if (current->fsuid != inode->i_uid &&
@@ -219,12 +219,10 @@
 	newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
 	if (utimes) {
 		struct timeval times[2];
-		error = verify_area(VERIFY_READ, utimes, sizeof(times));
-		if (error) {
+		if (copy_from_user(&times, utimes, sizeof(times))) {
 			iput(inode);
-			return error;
-		}
-		copy_from_user(&times, utimes, sizeof(times));
+			return -EFAULT;
+		}		
 		newattrs.ia_atime = times[0].tv_sec;
 		newattrs.ia_mtime = times[1].tv_sec;
 		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;