summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-04-25 22:58:05 +0200
committerJ. Bruce Fields <bfields@redhat.com>2012-06-01 02:29:36 +0200
commitbc1b542be9aba019ea89ef04da1f3592018a2a60 (patch)
tree5b1cc12a84c0506018051f0be7a60b4139c99dd4 /fs/nfsd
parentnfsd4: fix missing "static" (diff)
downloadlinux-bc1b542be9aba019ea89ef04da1f3592018a2a60.tar.xz
linux-bc1b542be9aba019ea89ef04da1f3592018a2a60.zip
nfsd4: preserve __user annotation on cld downcall msg
Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4recover.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 2b8e9a93fdd5..260d8c8f691b 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -570,7 +570,7 @@ static ssize_t
cld_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
{
struct cld_upcall *tmp, *cup;
- struct cld_msg *cmsg = (struct cld_msg *)src;
+ struct cld_msg __user *cmsg = (struct cld_msg __user *)src;
uint32_t xid;
struct nfsd_net *nn = net_generic(filp->f_dentry->d_sb->s_fs_info,
nfsd_net_id);