diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/autofs4/dev-ioctl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c index aaf96cb25452..ac7d921ed984 100644 --- a/fs/autofs4/dev-ioctl.c +++ b/fs/autofs4/dev-ioctl.c | |||
@@ -95,7 +95,7 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param) | |||
95 | */ | 95 | */ |
96 | static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *in) | 96 | static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *in) |
97 | { | 97 | { |
98 | struct autofs_dev_ioctl tmp; | 98 | struct autofs_dev_ioctl tmp, *res; |
99 | 99 | ||
100 | if (copy_from_user(&tmp, in, sizeof(tmp))) | 100 | if (copy_from_user(&tmp, in, sizeof(tmp))) |
101 | return ERR_PTR(-EFAULT); | 101 | return ERR_PTR(-EFAULT); |
@@ -106,7 +106,11 @@ static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *i | |||
106 | if (tmp.size > (PATH_MAX + sizeof(tmp))) | 106 | if (tmp.size > (PATH_MAX + sizeof(tmp))) |
107 | return ERR_PTR(-ENAMETOOLONG); | 107 | return ERR_PTR(-ENAMETOOLONG); |
108 | 108 | ||
109 | return memdup_user(in, tmp.size); | 109 | res = memdup_user(in, tmp.size); |
110 | if (!IS_ERR(res)) | ||
111 | res->size = tmp.size; | ||
112 | |||
113 | return res; | ||
110 | } | 114 | } |
111 | 115 | ||
112 | static inline void free_dev_ioctl(struct autofs_dev_ioctl *param) | 116 | static inline void free_dev_ioctl(struct autofs_dev_ioctl *param) |