Commit 85c6932e authored Mar 16, 2006 by Peter Staubach Committed by Linus Torvalds Mar 17, 2006

[PATCH] nfsservctl(): remove user-triggerable printk



A user can use nfsservctl() to spam the logs.

This can happen because the arguments to the nfsservctl() system call are
versioned.  This is a good thing.  However, when a bad version is detected,
the kernel prints a message and then returns an error.

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>

parent 5b40dc78

fs/nfsctl.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -98,10 +98,8 @@ asmlinkage sys_nfsservctl(int cmd, struct nfsctl_arg __user arg, void __user r
		if (copy_from_user(&version, &arg->ca_version, sizeof(int)))
		return -EFAULT;

		if (version != NFSCTL_VERSION) {
		printk(KERN_WARNING "nfsd: incompatible version in syscall.\n");
		if (version != NFSCTL_VERSION)
		return -EINVAL;
		}

		if (cmd < 0 \|\| cmd >= sizeof(map)/sizeof(map[0]) \|\| !map[cmd].name)
		return -EINVAL;