From f014d0847834a09c682686f7a3c0f7dd0eb6d4bf Mon Sep 17 00:00:00 2001 From: KaiGai Kohei Date: Thu, 30 Sep 2010 11:49:55 +0900 Subject: [PATCH] --- yaml --- r: 211670 b: refs/heads/master c: 36f7f28416c97dbb725154930066d115b4447e17 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/include/security.h | 3 +-- trunk/security/selinux/ss/status.c | 15 ++++++--------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 5e4bc6c65ebf..ef8346fece4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b0c543e5cb1e47a54d3ea791b8a03b9c8a715db +refs/heads/master: 36f7f28416c97dbb725154930066d115b4447e17 diff --git a/trunk/security/selinux/include/security.h b/trunk/security/selinux/include/security.h index e390e31bb4bf..4b66f19bb1f3 100644 --- a/trunk/security/selinux/include/security.h +++ b/trunk/security/selinux/include/security.h @@ -197,8 +197,7 @@ const char *security_get_initial_sid_context(u32 sid); extern struct page *selinux_kernel_status_page(void); #define SELINUX_KERNEL_STATUS_VERSION 1 -struct selinux_kernel_status -{ +struct selinux_kernel_status { u32 version; /* version number of thie structure */ u32 sequence; /* sequence number of seqlock logic */ u32 enforcing; /* current setting of enforcing mode */ diff --git a/trunk/security/selinux/ss/status.c b/trunk/security/selinux/ss/status.c index 5d9b225f8568..d982365f9d1a 100644 --- a/trunk/security/selinux/ss/status.c +++ b/trunk/security/selinux/ss/status.c @@ -35,7 +35,7 @@ * In most cases, application shall confirm the kernel status is not * changed without any system call invocations. */ -static struct page *selinux_status_page = NULL; +static struct page *selinux_status_page; static DEFINE_MUTEX(selinux_status_lock); /* @@ -50,11 +50,10 @@ struct page *selinux_kernel_status_page(void) struct page *result = NULL; mutex_lock(&selinux_status_lock); - if (!selinux_status_page) - { + if (!selinux_status_page) { selinux_status_page = alloc_page(GFP_KERNEL|__GFP_ZERO); - if (selinux_status_page) - { + + if (selinux_status_page) { status = page_address(selinux_status_page); status->version = SELINUX_KERNEL_STATUS_VERSION; @@ -86,8 +85,7 @@ void selinux_status_update_setenforce(int enforcing) struct selinux_kernel_status *status; mutex_lock(&selinux_status_lock); - if (selinux_status_page) - { + if (selinux_status_page) { status = page_address(selinux_status_page); status->sequence++; @@ -112,8 +110,7 @@ void selinux_status_update_policyload(int seqno) struct selinux_kernel_status *status; mutex_lock(&selinux_status_lock); - if (selinux_status_page) - { + if (selinux_status_page) { status = page_address(selinux_status_page); status->sequence++;