git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
fs
/
fhandle.c
diff --git
a/fs/fhandle.c
b/fs/fhandle.c
index
6b08864
..
c9e18f3
100644
(file)
--- a/
fs/fhandle.c
+++ b/
fs/fhandle.c
@@
-196,8
+196,9
@@
static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
goto out_err;
}
/* copy the full handle */
goto out_err;
}
/* copy the full handle */
- if (copy_from_user(handle, ufh,
- sizeof(struct file_handle) +
+ *handle = f_handle;
+ if (copy_from_user(&handle->f_handle,
+ &ufh->f_handle,
f_handle.handle_bytes)) {
retval = -EFAULT;
goto out_handle;
f_handle.handle_bytes)) {
retval = -EFAULT;
goto out_handle;