jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

afs: fix kernel_write / kernel_read arguments

Browse Source 
The order / content of the arguments passed to kernel_write and
kernel_read are not right. As a result, the kernel will panic if one of
the functions in question is called.

[kaduk@mit.edu: include configure check for multiple kernel_read()
variants, per linux commits bdd1d2d3d251c65b74ac4493e08db18971c09240
and e13ec939e96b13e664bb6cee361cc976a0ee621a]

FIXES 134440

Change-Id: I4753dee61f1b986bbe6a12b5568d1a8db30c65f8
Reviewed-on: https://gerrit.openafs.org/12769
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Marcio Barbosa 2017-11-16 17:24:03 -05:00 committed by Benjamin Kaduk
parent 50a3eb7b7e
commit 3ce55426ee
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -1195,6 +1195,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
LINUX_IOP_LOOKUP_TAKES_UNSIGNED LINUX_IOP_LOOKUP_TAKES_UNSIGNED
LINUX_D_INVALIDATE_IS_VOID LINUX_D_INVALIDATE_IS_VOID
LINUX_KERNEL_READ_OFFSET_IS_LAST
dnl If we are guaranteed that keyrings will work - that is dnl If we are guaranteed that keyrings will work - that is
dnl a) The kernel has keyrings enabled dnl a) The kernel has keyrings enabled

8
src/afs/LINUX/osi_compat.h
View File

@ -659,7 +659,11 @@ afs_file_read(struct file *filp, char __user *buf, size_t len, loff_t *pos)
#if defined(HAVE_LINUX___VFS_WRITE) #if defined(HAVE_LINUX___VFS_WRITE)
return __vfs_read(filp, buf, len, pos); return __vfs_read(filp, buf, len, pos);
#elif defined(HAVE_LINUX_KERNEL_WRITE) #elif defined(HAVE_LINUX_KERNEL_WRITE)
# if defined(LINUX_KERNEL_READ_OFFSET_IS_LAST)
return kernel_read(filp, buf, len, pos); return kernel_read(filp, buf, len, pos);
# else
return kernel_read(filp, *pos, buf, len);
# endif
#else #else
return filp->f_op->read(filp, buf, len, pos); return filp->f_op->read(filp, buf, len, pos);
#endif #endif
@ -671,7 +675,11 @@ afs_file_write(struct file *filp, char __user *buf, size_t len, loff_t *pos)
#if defined(HAVE_LINUX___VFS_WRITE) #if defined(HAVE_LINUX___VFS_WRITE)
return __vfs_write(filp, buf, len, pos); return __vfs_write(filp, buf, len, pos);
#elif defined(HAVE_LINUX_KERNEL_WRITE) #elif defined(HAVE_LINUX_KERNEL_WRITE)
# if defined(LINUX_KERNEL_READ_OFFSET_IS_LAST)
return kernel_write(filp, buf, len, pos); return kernel_write(filp, buf, len, pos);
# else
return kernel_write(filp, buf, len, *pos);
# endif
#else #else
return filp->f_op->write(filp, buf, len, pos); return filp->f_op->write(filp, buf, len, pos);
#endif #endif

12
src/cf/linux-test4.m4
View File

@ -799,3 +799,15 @@ AC_DEFUN([LINUX_D_INVALIDATE_IS_VOID], [
[define if your d_invalidate returns void], [define if your d_invalidate returns void],
[]) [])
]) ])
AC_DEFUN([LINUX_KERNEL_READ_OFFSET_IS_LAST], [
AC_CHECK_LINUX_BUILD([whether offset is the last argument to kernel_read],
[ac_cv_linux_func_kernel_read_offset_is_last],
[#include <linux/fs.h>],
[
ssize_t kernel_read(struct file *, void *, size_t, loff_t *);
],
[KERNEL_READ_OFFSET_IS_LAST],
[define if your kernel_read has offset as the last argument],
[])
])