[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1332036464-9538-1-git-send-email-santoshprasadnayak@gmail.com>
Date: Sun, 18 Mar 2012 07:37:44 +0530
From: santosh nayak <santoshprasadnayak@...il.com>
To: takedakn@...data.co.jp
Cc: penguin-kernel@...ove.SAKURA.ne.jp, james.l.morris@...cle.com,
linux-security-module@...r.kernel.org,
linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org,
Santosh Nayak <santoshprasadnayak@...il.com>
Subject: [PATCH] TOMOYO: Return error if fails to delete a domain.
From: Santosh Nayak <santoshprasadnayak@...il.com>
'tomoyo_write_domain' should return error from tomoyo_delete_domain()
to its caller.
Signed-off-by: Santosh Nayak <santoshprasadnayak@...il.com>
---
security/tomoyo/common.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index c47d3ce..d13b9a7 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -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;
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists