diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-21 22:19:57 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:20 +0100 |
| commit | 17f606d841fbc7e0331af2f0cab2af801f18ed46 (patch) | |
| tree | b69b21e1027402e2c2539e7e1c6fc2911411d7e2 /fs | |
| parent | cc9247b6d794b82e7e8bc0cb7a936181015c8e90 (diff) | |
| download | linux-stable-17f606d841fbc7e0331af2f0cab2af801f18ed46.tar.gz linux-stable-17f606d841fbc7e0331af2f0cab2af801f18ed46.tar.bz2 linux-stable-17f606d841fbc7e0331af2f0cab2af801f18ed46.zip | |
autofs4 copy_dev_ioctl(): keep the value of ->size we'd used for allocation
commit 0a280962dc6e117e0e4baa668453f753579265d9 upstream.
X-Coverup: just ask spender
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 868101ccbefa..62d7a6d9a701 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) */ static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *in) { - struct autofs_dev_ioctl tmp; + struct autofs_dev_ioctl tmp, *res; if (copy_from_user(&tmp, in, sizeof(tmp))) return ERR_PTR(-EFAULT); @@ -106,7 +106,11 @@ static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *i if (tmp.size > (PATH_MAX + sizeof(tmp))) return ERR_PTR(-ENAMETOOLONG); - return memdup_user(in, tmp.size); + res = memdup_user(in, tmp.size); + if (!IS_ERR(res)) + res->size = tmp.size; + + return res; } static inline void free_dev_ioctl(struct autofs_dev_ioctl *param) |