Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / net / sunrpc / debugfs.c

diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c
index 7cc1b8a6ef6d54e2c8cdb7737310ba7a4b0ce73d..e7b4d93566df42dfa5ecf985152235e539ed9933 100644 (file)
--- a/net/sunrpc/debugfs.c
+++ b/net/sunrpc/debugfs.c
@@ -304,7 +304,8 @@ fault_disconnect_write(struct file *filp, const char __user *user_buf,
 {
        char buffer[16];
 
-       len = min(len, sizeof(buffer) - 1);
+       if (len >= sizeof(buffer))
+               len = sizeof(buffer) - 1;
        if (copy_from_user(buffer, user_buf, len))
                return -EFAULT;
        buffer[len] = '\0';