diff options
| author | Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> | 2012-03-14 13:27:49 +0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-03-15 05:29:18 +0400 |
| commit | 6041e8346f2165679c2184cab60db768d6a26a1d (patch) | |
| tree | 2c4eb032eb851f240c1b70d1afb214a2c661b886 /security/tomoyo/audit.c | |
| parent | f67dabbdde1fe112dfff05d02890f1e0d54117a8 (diff) | |
| download | linux-6041e8346f2165679c2184cab60db768d6a26a1d.tar.xz | |
TOMOYO: Return appropriate value to poll().
"struct file_operations"->poll() expects "unsigned int" return value.
All files in /sys/kernel/security/tomoyo/ directory other than
/sys/kernel/security/tomoyo/query and /sys/kernel/security/tomoyo/audit should
return POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM rather than -ENOSYS.
Also, /sys/kernel/security/tomoyo/query and /sys/kernel/security/tomoyo/audit
should return POLLOUT | POLLWRNORM rather than 0 when there is no data to read.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/tomoyo/audit.c')
| -rw-r--r-- | security/tomoyo/audit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/tomoyo/audit.c b/security/tomoyo/audit.c index 5ca47ea3049f..7ef9fa3e37e0 100644 --- a/security/tomoyo/audit.c +++ b/security/tomoyo/audit.c @@ -446,11 +446,11 @@ void tomoyo_read_log(struct tomoyo_io_buffer *head) * tomoyo_poll_log - Wait for an audit log. * * @file: Pointer to "struct file". - * @wait: Pointer to "poll_table". + * @wait: Pointer to "poll_table". Maybe NULL. * * Returns POLLIN | POLLRDNORM when ready to read an audit log. */ -int tomoyo_poll_log(struct file *file, poll_table *wait) +unsigned int tomoyo_poll_log(struct file *file, poll_table *wait) { if (tomoyo_log_count) return POLLIN | POLLRDNORM; |