mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
ceph: fix compat_ioctl for ceph_dir_operations
commit 18bd6caaef4021803dd0d031dc37c2d001d18a5b upstream. The ceph_ioctl function is used both for files and directories, but only the files support doing that in 32-bit compat mode. On the s390 architecture, there is also a problem with invalid 31-bit pointers that need to be passed through compat_ptr(). Use the new compat_ptr_ioctl() to address both issues. Note: When backporting this patch to stable kernels, "compat_ioctl: add compat_ptr_ioctl()" is needed as well. Reviewed-by: "Yan, Zheng" <[email protected]> Cc: [email protected] Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
8896dd968b
commit
c13f137cfa
2 changed files with 2 additions and 1 deletions
|
|
@ -1809,6 +1809,7 @@ const struct file_operations ceph_dir_fops = {
|
|||
.open = ceph_open,
|
||||
.release = ceph_release,
|
||||
.unlocked_ioctl = ceph_ioctl,
|
||||
.compat_ioctl = compat_ptr_ioctl,
|
||||
.fsync = ceph_fsync,
|
||||
.lock = ceph_lock,
|
||||
.flock = ceph_flock,
|
||||
|
|
|
|||
|
|
@ -2188,7 +2188,7 @@ const struct file_operations ceph_file_fops = {
|
|||
.splice_read = generic_file_splice_read,
|
||||
.splice_write = iter_file_splice_write,
|
||||
.unlocked_ioctl = ceph_ioctl,
|
||||
.compat_ioctl = ceph_ioctl,
|
||||
.compat_ioctl = compat_ptr_ioctl,
|
||||
.fallocate = ceph_fallocate,
|
||||
.copy_file_range = ceph_copy_file_range,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue