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

Commit 7d7473db authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

TOMOYO: Return error if fails to delete a domain 



Call sequence:
tomoyo_write_domain() --> tomoyo_delete_domain()

In 'tomoyo_delete_domain', return -EINTR if locking attempt is
interrupted by signal.

At present it returns success to its caller 'tomoyo_write_domain()'
even though domain is not deleted. 'tomoyo_write_domain()' assumes
domain is deleted and returns success to its caller. This is wrong behaviour.

'tomoyo_write_domain' should return error from tomoyo_delete_domain() to its
caller.

Signed-off-by: default avatarSantosh Nayak <santoshprasadnayak@gmail.com>
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent b01d3fb9

security/tomoyo/common.c

+5 −4
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ static int tomoyo_write_task(struct tomoyo_acl_param *param) 
 *

 * @domainname: The name of domain.

 *

 * Returns 0.

 * Returns 0 on success, negative value otherwise.

 *

 * Caller holds tomoyo_read_lock().

 */
@@ -1081,7 +1081,7 @@ static int tomoyo_delete_domain(char *domainname) 
	name.name = domainname;

	tomoyo_fill_path_info(&name);

	if (mutex_lock_interruptible(&tomoyo_policy_lock))

		return 0;

		return -EINTR;

	/* Is there an active domain? */

	list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {

		/* Never delete tomoyo_kernel_domain */
@@ -1164,15 +1164,16 @@ static int tomoyo_write_domain(struct tomoyo_io_buffer *head) 
	bool is_select = !is_delete && tomoyo_str_starts(&data, "select ");

	unsigned int profile;

	if (*data == '<') {

		int ret = 0;

		domain = NULL;

		if (is_delete)

			tomoyo_delete_domain(data);

			ret = tomoyo_delete_domain(data);

		else if (is_select)

			domain = tomoyo_find_domain(data);

		else

			domain = tomoyo_assign_domain(data, false);

		head->w.domain = domain;

		return 0;

		return ret;

	}

	if (!domain)

		return -EINVAL;