From 3a98bfa58b3956f4479958ec0a3f69d658f250e9 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Tue, 18 Oct 2011 14:34:28 +0300 Subject: [PATCH] --- yaml --- r: 264570 b: refs/heads/master c: d86b2b61d4dea614d6f319772a90a8f98b55ed67 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/smack/smackfs.c | 2 +- trunk/security/tomoyo/common.c | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 094169106bec..141212648794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0b057b406a33501a656dc8d67ea945d7bcdad61 +refs/heads/master: d86b2b61d4dea614d6f319772a90a8f98b55ed67 diff --git a/trunk/security/smack/smackfs.c b/trunk/security/smack/smackfs.c index 5498c4a2d1ae..381eecffe516 100644 --- a/trunk/security/smack/smackfs.c +++ b/trunk/security/smack/smackfs.c @@ -1514,7 +1514,7 @@ static ssize_t smk_write_access(struct file *file, const char __user *buf, data[0] = res == 0 ? '1' : '0'; data[1] = '\0'; - simple_transaction_set(file, 1); + simple_transaction_set(file, 2); return SMK_LOADLEN; } diff --git a/trunk/security/tomoyo/common.c b/trunk/security/tomoyo/common.c index d41900de8a69..365f3bddee79 100644 --- a/trunk/security/tomoyo/common.c +++ b/trunk/security/tomoyo/common.c @@ -502,10 +502,8 @@ static struct tomoyo_profile *tomoyo_assign_profile TOMOYO_CONFIG_WANT_REJECT_LOG; memset(ptr->config, TOMOYO_CONFIG_USE_DEFAULT, sizeof(ptr->config)); - ptr->pref[TOMOYO_PREF_MAX_AUDIT_LOG] = - CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG; - ptr->pref[TOMOYO_PREF_MAX_LEARNING_ENTRY] = - CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY; + ptr->pref[TOMOYO_PREF_MAX_AUDIT_LOG] = 1024; + ptr->pref[TOMOYO_PREF_MAX_LEARNING_ENTRY] = 2048; mb(); /* Avoid out-of-order execution. */ ns->profile_ptr[profile] = ptr; entry = NULL; @@ -2591,7 +2589,6 @@ ssize_t tomoyo_write_control(struct tomoyo_io_buffer *head, return -EFAULT; if (mutex_lock_interruptible(&head->io_sem)) return -EINTR; - head->read_user_buf_avail = 0; idx = tomoyo_read_lock(); /* Read a line and dispatch it to the policy handler. */ while (avail_len > 0) {