From: Andrew Morton <akpm@osdl.org>
Date: Sat, 17 Sep 2005 02:27:56 +0000 (-0700)
Subject: [PATCH] seclvl-use-securityfs tidy
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d15c5749eb81dee94d40fe12584ca8461858b4cb;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

[PATCH] seclvl-use-securityfs tidy

We don't put braces around single statements, thanks.

Cc: Serge Hallyn <serue@us.ibm.com>
Cc: James Morris <jmorris@namei.org>
Cc: Chris Wright <chrisw@osdl.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/security/seclvl.c b/security/seclvl.c
index dc4e17b6eaf6..241093d6f0b8 100644
--- a/security/seclvl.c
+++ b/security/seclvl.c
@@ -253,9 +253,8 @@ passwd_write_file(struct file * file, const char __user * buf,
 
 	if (count < 0 || count >= PAGE_SIZE)
 		return -ENOMEM;
-	if (*ppos != 0) {
+	if (*ppos != 0)
 		return -EINVAL;
-	}
 	page = (char *)get_zeroed_page(GFP_KERNEL);
 	if (!page)
 		return -ENOMEM;
@@ -265,9 +264,8 @@ passwd_write_file(struct file * file, const char __user * buf,
 	
 	len = strlen(page);
 	/* ``echo "secret" > seclvl/passwd'' includes a newline */
-	if (page[len - 1] == '\n') {
+	if (page[len - 1] == '\n')
 		len--;
-	}
 	/* Hash the password, then compare the hashed values */
 	if ((rc = plaintext_to_sha1(tmp, page, len))) {
 		seclvl_printk(0, KERN_ERR, "Error hashing password: rc = "
@@ -275,9 +273,8 @@ passwd_write_file(struct file * file, const char __user * buf,
 		return rc;
 	}
 	for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
-		if (hashedPassword[i] != tmp[i]) {
+		if (hashedPassword[i] != tmp[i])
 			return -EPERM;
-		}
 	}
 	seclvl_printk(0, KERN_INFO,
 		      "Password accepted; seclvl reduced to 0.\n");
@@ -482,9 +479,8 @@ static void seclvl_file_free_security(struct file *filp)
  */
 static int seclvl_umount(struct vfsmount *mnt, int flags)
 {
-	if (current->pid == 1) {
+	if (current->pid == 1)
 		return 0;
-	}
 	if (seclvl == 2) {
 		seclvl_printk(1, KERN_WARNING, "Attempt to unmount in secure "
 			      "level %d\n", seclvl);
@@ -638,9 +634,8 @@ static int __init seclvl_init(void)
 static void __exit seclvl_exit(void)
 {
 	securityfs_remove(seclvl_ino);
-	if (*passwd || *sha1_passwd) {
+	if (*passwd || *sha1_passwd)
 		securityfs_remove(passwd_ino);
-	}
 	securityfs_remove(dir_ino);
 	if (secondary == 1) {
 		mod_unreg_security(MY_NAME, &seclvl_ops);