Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d4be28 authored by Al Viro's avatar Al Viro
Browse files

tomoyo: annotate ->poll() instances 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 680ef72a

security/tomoyo/audit.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ void tomoyo_read_log(struct tomoyo_io_buffer *head) 
 *

 * Returns POLLIN | POLLRDNORM when ready to read an audit log.

 */

unsigned int tomoyo_poll_log(struct file *file, poll_table *wait)

__poll_t tomoyo_poll_log(struct file *file, poll_table *wait)

{

	if (tomoyo_log_count)

		return POLLIN | POLLRDNORM;

security/tomoyo/common.c

+2 −2
Original line number Diff line number Diff line
@@ -2120,7 +2120,7 @@ static struct tomoyo_domain_info *tomoyo_find_domain_by_qid 
 *

 * Waits for access requests which violated policy in enforcing mode.

 */

static unsigned int tomoyo_poll_query(struct file *file, poll_table *wait)

static __poll_t tomoyo_poll_query(struct file *file, poll_table *wait)

{

	if (!list_empty(&tomoyo_query_list))

		return POLLIN | POLLRDNORM;
@@ -2453,7 +2453,7 @@ int tomoyo_open_control(const u8 type, struct file *file) 
 * Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,

 * POLLOUT | POLLWRNORM otherwise.

 */

unsigned int tomoyo_poll_control(struct file *file, poll_table *wait)

__poll_t tomoyo_poll_control(struct file *file, poll_table *wait)

{

	struct tomoyo_io_buffer *head = file->private_data;

	if (head->poll)

security/tomoyo/common.h

+3 −3
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ struct tomoyo_acl_param { 
struct tomoyo_io_buffer {

	void (*read) (struct tomoyo_io_buffer *);

	int (*write) (struct tomoyo_io_buffer *);

	unsigned int (*poll) (struct file *file, poll_table *wait);

	__poll_t (*poll) (struct file *file, poll_table *wait);

	/* Exclusive lock for this structure.   */

	struct mutex io_sem;

	char __user *read_user_buf;
@@ -981,8 +981,8 @@ int tomoyo_path_number_perm(const u8 operation, const struct path *path, 
			    unsigned long number);

int tomoyo_path_perm(const u8 operation, const struct path *path,

		     const char *target);

unsigned int tomoyo_poll_control(struct file *file, poll_table *wait);

unsigned int tomoyo_poll_log(struct file *file, poll_table *wait);

__poll_t tomoyo_poll_control(struct file *file, poll_table *wait);

__poll_t tomoyo_poll_log(struct file *file, poll_table *wait);

int tomoyo_socket_bind_permission(struct socket *sock, struct sockaddr *addr,

				  int addr_len);

int tomoyo_socket_connect_permission(struct socket *sock,

security/tomoyo/securityfs_if.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int tomoyo_release(struct inode *inode, struct file *file) 
 * Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,

 * POLLOUT | POLLWRNORM otherwise.

 */

static unsigned int tomoyo_poll(struct file *file, poll_table *wait)

static __poll_t tomoyo_poll(struct file *file, poll_table *wait)

{

	return tomoyo_poll_control(file, wait);

}