Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10069
b: refs/heads/master
c: 8766ce4
h: refs/heads/master
i:
  10067: 3967ebe
v: v3
  • Loading branch information
Kostik Belousov authored and Linus Torvalds committed Oct 23, 2005
1 parent a1bfb93 commit a753718
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a991304496bdaec09f497d1eb5d9dcf2f94b7d5d
refs/heads/master: 8766ce41018a0cb80fbe0ce7dbf747f357c752da
6 changes: 6 additions & 0 deletions trunk/fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,9 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb)
if (unlikely(!access_ok(VERIFY_WRITE, kiocb->ki_buf,
kiocb->ki_left)))
break;
ret = security_file_permission(file, MAY_READ);
if (unlikely(ret))
break;
ret = -EINVAL;
if (file->f_op->aio_read)
kiocb->ki_retry = aio_pread;
Expand All @@ -1409,6 +1412,9 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb)
if (unlikely(!access_ok(VERIFY_READ, kiocb->ki_buf,
kiocb->ki_left)))
break;
ret = security_file_permission(file, MAY_WRITE);
if (unlikely(ret))
break;
ret = -EINVAL;
if (file->f_op->aio_write)
kiocb->ki_retry = aio_pwrite;
Expand Down

0 comments on commit a753718

Please sign in to comment.