diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-22 15:04:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-22 15:04:51 -0400 |
commit | 165ea0d1c2286f550efbf14dc3528267af088f08 (patch) | |
tree | 913ef8a34b31056ad13f04ec1dbb38a092974d88 /fs/aio.c | |
parent | f88a333b44318643282b8acc92af90deda441f5e (diff) | |
parent | 9ba546c01976a426292af99e682a557075d6c010 (diff) |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Fix several places that screw up cleanups after failures halfway
through opening a file (one open-coding filp_clone_open() and getting
it wrong, two misusing alloc_file()). That part is -stable fodder from
the 'work.open' branch.
And Christoph's regression fix for uapi breakage in aio series;
include/uapi/linux/aio_abi.h shouldn't be pulling in the kernel
definition of sigset_t, the reason for doing so in the first place had
been bogus - there's no need to expose struct __aio_sigset in
aio_abi.h at all"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aio: don't expose __aio_sigset in uapi
ocxlflash_getfile(): fix double-iput() on alloc_file() failures
cxl_getfile(): fix double-iput() on alloc_file() failures
drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open()
Diffstat (limited to 'fs/aio.c')
-rw-r--r-- | fs/aio.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1896,6 +1896,11 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, | |||
1896 | return ret; | 1896 | return ret; |
1897 | } | 1897 | } |
1898 | 1898 | ||
1899 | struct __aio_sigset { | ||
1900 | const sigset_t __user *sigmask; | ||
1901 | size_t sigsetsize; | ||
1902 | }; | ||
1903 | |||
1899 | SYSCALL_DEFINE6(io_pgetevents, | 1904 | SYSCALL_DEFINE6(io_pgetevents, |
1900 | aio_context_t, ctx_id, | 1905 | aio_context_t, ctx_id, |
1901 | long, min_nr, | 1906 | long, min_nr, |