author: Linus Torvalds <torvalds@linux-foundation.org> 2018-04-06 11:07:08 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2018-04-06 11:07:08 -0700
commit: 9022ca6b1129da44e3d5c4fa779b8bb9ceabe2ce
parent: 38c23685b273cfb4ccf31a199feccce3bdcb5d83
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c
index a09419379f5d..5661da1972cd 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -39,6 +39,7 @@
#include <linux/bitops.h>
#include <linux/init_task.h>
#include <linux/uaccess.h>
+#include <linux/build_bug.h>
#include "internal.h"
#include "mount.h"
@@ -130,6 +131,7 @@ getname_flags(const char __user *filename, int flags, int *empty)
struct filename *result;
char *kname;
int len;
+ BUILD_BUG_ON(offsetof(struct filename, iname) % sizeof(long) != 0);
result = audit_reusename(filename);
if (result)
@@ -3374,9 +3376,7 @@ finish_open_created:
goto out;
*opened |= FILE_OPENED;
opened:
- error = open_check_o_direct(file);
- if (!error)
- error = ima_file_check(file, op->acc_mode, *opened);
+ error = ima_file_check(file, op->acc_mode, *opened);
if (!error && will_truncate)
error = handle_truncate(file);
out:
@@ -3456,9 +3456,6 @@ static int do_tmpfile(struct nameidata *nd, unsigned flags,
error = finish_open(file, child, NULL, opened);
if (error)
goto out2;
- error = open_check_o_direct(file);
- if (error)
- fput(file);
out2:
mnt_drop_write(path.mnt);
out: