aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2018-06-24 19:28:13 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-06-24 19:28:13 -0400
commit10b6e089e589a3bfc2b1ee0c9aca98183e4b9b32 (patch)
tree9c732f14bc5161bfe1ca7a78b0aa17bd0375811f /misc
parent0790bf05a255d9cfdeaf0637e2a1a6072134b4a7 (diff)
downloadandroid_external_e2fsprogs-10b6e089e589a3bfc2b1ee0c9aca98183e4b9b32.tar.gz
android_external_e2fsprogs-10b6e089e589a3bfc2b1ee0c9aca98183e4b9b32.tar.bz2
android_external_e2fsprogs-10b6e089e589a3bfc2b1ee0c9aca98183e4b9b32.zip
e4crypt: remove unneeded stat(2) call in do_get_policy()
We don't need to conditionally use O_DIRECTORY when opening a directory. Remove the unneeded stat, and a TOCTOU complaint from Coverity. Fixes-Coverity-Bug: 1293497 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'misc')
-rw-r--r--misc/e4crypt.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/misc/e4crypt.c b/misc/e4crypt.c
index 3efbf6e6..2ae6254a 100644
--- a/misc/e4crypt.c
+++ b/misc/e4crypt.c
@@ -760,7 +760,6 @@ static void do_set_policy(int argc, char **argv, const struct cmd_desc *cmd)
static void do_get_policy(int argc, char **argv, const struct cmd_desc *cmd)
{
struct ext4_encryption_policy policy;
- struct stat st;
int i, j, fd, rc;
if (argc < 2) {
@@ -771,12 +770,7 @@ static void do_get_policy(int argc, char **argv, const struct cmd_desc *cmd)
}
for (i = 1; i < argc; i++) {
- if (stat(argv[i], &st) < 0) {
- perror(argv[i]);
- continue;
- }
- fd = open(argv[i],
- S_ISDIR(st.st_mode) ? O_DIRECTORY : O_RDONLY);
+ fd = open(argv[i], O_RDONLY);
if (fd == -1) {
perror(argv[i]);
exit(1);