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

Commit 0849e3ba authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

TOMOYO: Add missing poll() hook. 



Commit 1dae08c "TOMOYO: Add interactive enforcing mode." forgot to register
poll() hook. As a result, /usr/sbin/tomoyo-queryd was doing busy loop.

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent e2bf6907

security/tomoyo/common.c

+17 −0
Original line number Diff line number Diff line
@@ -1897,6 +1897,23 @@ int tomoyo_open_control(const u8 type, struct file *file) 
	return 0;

}



/**

 * tomoyo_poll_control - poll() for /sys/kernel/security/tomoyo/ interface.

 *

 * @file: Pointer to "struct file".

 * @wait: Pointer to "poll_table".

 *

 * Waits for read readiness.

 * /sys/kernel/security/tomoyo/query is handled by /usr/sbin/tomoyo-queryd .

 */

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

{

	struct tomoyo_io_buffer *head = file->private_data;

	if (!head->poll)

		return -ENOSYS;

	return head->poll(file, wait);

}



/**

 * tomoyo_read_control - read() for /sys/kernel/security/tomoyo/ interface.

 *

security/tomoyo/common.h

+2 −0
Original line number Diff line number Diff line
@@ -705,6 +705,8 @@ void tomoyo_check_profile(void); 
int tomoyo_open_control(const u8 type, struct file *file);

/* Close /sys/kernel/security/tomoyo/ interface. */

int tomoyo_close_control(struct file *file);

/* Poll operation for /sys/kernel/security/tomoyo/ interface. */

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

/* Read operation for /sys/kernel/security/tomoyo/ interface. */

int tomoyo_read_control(struct file *file, char __user *buffer,

			const int buffer_len);

security/tomoyo/securityfs_if.c

+14 −0
Original line number Diff line number Diff line
@@ -37,6 +37,19 @@ static int tomoyo_release(struct inode *inode, struct file *file) 
	return tomoyo_close_control(file);

}



/**

 * tomoyo_poll - poll() for /proc/ccs/ interface.

 *

 * @file: Pointer to "struct file".

 * @wait: Pointer to "poll_table".

 *

 * Returns 0 on success, negative value otherwise.

 */

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

{

	return tomoyo_poll_control(file, wait);

}



/**

 * tomoyo_read - read() for /sys/kernel/security/tomoyo/ interface.

 *
@@ -79,6 +92,7 @@ static ssize_t tomoyo_write(struct file *file, const char __user *buf, 
static const struct file_operations tomoyo_operations = {

	.open    = tomoyo_open,

	.release = tomoyo_release,

	.poll    = tomoyo_poll,

	.read    = tomoyo_read,

	.write   = tomoyo_write,

};