| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 15 Dec 2008 02:33:20 +0800
From: Coly Li <coly.li@...e.de>
To: linux-kernel@...r.kernel.org
Subject: [PATCH] avoid unnecessary assignment in lookup_bdev()
In normal cases, lookup_bdev() should return successfully, therefore it's not a good idea to always
assign error values before checking truth/false conditions. This patch modifies code to only assign
error value in necessary false conditions.
If I missed something, please correct me.
Signed-off-by: Coly Li <coly.li@...e.de>
---
fs/block_dev.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 99e0ae1..10b656f 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1282,16 +1282,19 @@ struct block_device *lookup_bdev(const char *pathname)
return ERR_PTR(error);
inode = path.dentry->d_inode;
- error = -ENOTBLK;
- if (!S_ISBLK(inode->i_mode))
+ if (!S_ISBLK(inode->i_mode)) {
+ error = -ENOTBLK;
goto fail;
- error = -EACCES;
- if (path.mnt->mnt_flags & MNT_NODEV)
+ }
+ if (path.mnt->mnt_flags & MNT_NODEV) {
+ error = -EACCES;
goto fail;
- error = -ENOMEM;
+ }
bdev = bd_acquire(inode);
- if (!bdev)
+ if (!bdev) {
+ error = -ENOMEM;
goto fail;
+ }
out:
path_put(&path);
return bdev;
--
Coly Li
SuSE PRC Labs
--
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