Commit a372f780 authored by Al Viro's avatar Al Viro Committed by Luis Henriques

staging: lustre: echo_copy.._lsm() dereferences userland pointers directly

commit 9225c0b7 upstream.

missing get_user()
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent db5e80ca
...@@ -1380,6 +1380,7 @@ static int ...@@ -1380,6 +1380,7 @@ static int
echo_copyout_lsm (struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob) echo_copyout_lsm (struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob)
{ {
struct lov_stripe_md *ulsm = _ulsm; struct lov_stripe_md *ulsm = _ulsm;
struct lov_oinfo **p;
int nob, i; int nob, i;
nob = offsetof (struct lov_stripe_md, lsm_oinfo[lsm->lsm_stripe_count]); nob = offsetof (struct lov_stripe_md, lsm_oinfo[lsm->lsm_stripe_count]);
...@@ -1389,9 +1390,10 @@ echo_copyout_lsm (struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob) ...@@ -1389,9 +1390,10 @@ echo_copyout_lsm (struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob)
if (copy_to_user (ulsm, lsm, sizeof(*ulsm))) if (copy_to_user (ulsm, lsm, sizeof(*ulsm)))
return (-EFAULT); return (-EFAULT);
for (i = 0; i < lsm->lsm_stripe_count; i++) { for (i = 0, p = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, p++) {
if (copy_to_user (ulsm->lsm_oinfo[i], lsm->lsm_oinfo[i], struct lov_oinfo __user *up;
sizeof(lsm->lsm_oinfo[0]))) if (get_user(up, ulsm->lsm_oinfo + i) ||
copy_to_user(up, *p, sizeof(struct lov_oinfo)))
return (-EFAULT); return (-EFAULT);
} }
return 0; return 0;
...@@ -1399,9 +1401,10 @@ echo_copyout_lsm (struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob) ...@@ -1399,9 +1401,10 @@ echo_copyout_lsm (struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob)
static int static int
echo_copyin_lsm (struct echo_device *ed, struct lov_stripe_md *lsm, echo_copyin_lsm (struct echo_device *ed, struct lov_stripe_md *lsm,
void *ulsm, int ulsm_nob) struct lov_stripe_md __user *ulsm, int ulsm_nob)
{ {
struct echo_client_obd *ec = ed->ed_ec; struct echo_client_obd *ec = ed->ed_ec;
struct lov_oinfo **p;
int i; int i;
if (ulsm_nob < sizeof (*lsm)) if (ulsm_nob < sizeof (*lsm))
...@@ -1417,11 +1420,10 @@ echo_copyin_lsm (struct echo_device *ed, struct lov_stripe_md *lsm, ...@@ -1417,11 +1420,10 @@ echo_copyin_lsm (struct echo_device *ed, struct lov_stripe_md *lsm,
return (-EINVAL); return (-EINVAL);
for (i = 0; i < lsm->lsm_stripe_count; i++) { for (i = 0, p = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, p++) {
if (copy_from_user(lsm->lsm_oinfo[i], struct lov_oinfo __user *up;
((struct lov_stripe_md *)ulsm)-> \ if (get_user(up, ulsm->lsm_oinfo + i) ||
lsm_oinfo[i], copy_from_user(*p, up, sizeof(struct lov_oinfo)))
sizeof(lsm->lsm_oinfo[0])))
return (-EFAULT); return (-EFAULT);
} }
return (0); return (0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment