Ver Fonte

[PATCH] compat_sys_nfsservctl(): handle errors correctly

Correct some error handling on the compat version of the nfsservctl()
system.  It was detecting errors while copying in the arguments from user
space, but then attempting to use the arguments anyway.  This didn't seem
so good.

Signed-off-by: Peter Staubach <staubach@redhat.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Peter Staubach há 20 anos atrás
pai
commit
57070d012c
1 ficheiros alterados com 4 adições e 1 exclusões
  1. 4 1
      fs/compat.c

+ 4 - 1
fs/compat.c

@@ -2170,9 +2170,12 @@ asmlinkage long compat_sys_nfsservctl(int cmd, struct compat_nfsctl_arg __user *
 
 
 	default:
 	default:
 		err = -EINVAL;
 		err = -EINVAL;
-		goto done;
+		break;
 	}
 	}
 
 
+	if (err)
+		goto done;
+
 	oldfs = get_fs();
 	oldfs = get_fs();
 	set_fs(KERNEL_DS);
 	set_fs(KERNEL_DS);
 	/* The __user pointer casts are valid because of the set_fs() */
 	/* The __user pointer casts are valid because of the set_fs() */