iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] seclvl-use-securityfs tidy

Browse Source 
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>
This commit is contained in:
Andrew Morton 2005-09-16 19:27:56 -07:00 committed by Linus Torvalds
parent 73a0b538ee
commit d15c5749eb
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
security/seclvl.c
View File

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