nfsd: Propagate some error code returned by memdup_user()

[ Upstream commit 30a30fcc3fc1ad4c5d017c9fcb75dc8f59e7bdad ]

Propagate the error code returned by memdup_user() instead of a hard coded
-EFAULT.

Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 4edfc9580641225d4550d64337f880cb7de5d233..5d680045fa2c7fcb6377b41b1b656df5abccfde6 100644 (file)
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -808,7 +808,7 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,
                                return -EFAULT;
                        name.data = memdup_user(&ci->cc_name.cn_id, namelen);
                        if (IS_ERR(name.data))
-                               return -EFAULT;
+                               return PTR_ERR(name.data);
                        name.len = namelen;
                        get_user(princhashlen, &ci->cc_princhash.cp_len);
                        if (princhashlen > 0) {
@@ -817,7 +817,7 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,
                                                princhashlen);
                                if (IS_ERR(princhash.data)) {
                                        kfree(name.data);
-                                       return -EFAULT;
+                                       return PTR_ERR(princhash.data);
                                }
                                princhash.len = princhashlen;
                        } else
@@ -830,7 +830,7 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,
                                return -EFAULT;
                        name.data = memdup_user(&cnm->cn_id, namelen);
                        if (IS_ERR(name.data))
-                               return -EFAULT;
+                               return PTR_ERR(name.data);
                        name.len = namelen;
                }
                if (name.len > 5 && memcmp(name.data, "hash:", 5) == 0) {