>From 7dde54b74e4543b6f03ceb57f9479a1d402a3fd1 Mon Sep 17 00:00:00 2001 From: Scotty Bauer Date: Wed, 6 Jan 2016 18:17:35 -0700 Subject: [PATCH] dm ioctl: disambiguate the user pointer calculation This patch adds an & in front of user->version, in hopes of making it clear that user-memory is not being touched. Signed-off-by: Scotty Bauer --- drivers/md/dm-ioctl.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index fa5bf54..81190df 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1642,13 +1642,9 @@ static ioctl_fn lookup_ioctl(unsigned int cmd, int *ioctl_flags) static int check_version(unsigned int cmd, struct dm_ioctl __user *user) { uint32_t version[3]; - uint32_t __user *versionp; int r = 0; - if (copy_from_user(&versionp, &user->version, sizeof(versionp))) - return -EFAULT; - - if (copy_from_user(version, versionp, sizeof(version))) + if (copy_from_user(version, &user->version, sizeof(version))) return -EFAULT; if ((DM_VERSION_MAJOR != version[0]) || @@ -1667,7 +1663,7 @@ static int check_version(unsigned int cmd, struct dm_ioctl __user *user) version[0] = DM_VERSION_MAJOR; version[1] = DM_VERSION_MINOR; version[2] = DM_VERSION_PATCHLEVEL; - if (copy_to_user(versionp, version, sizeof(version))) + if (copy_to_user(&user->version, version, sizeof(version))) return -EFAULT; return r; -- 1.9.1