2 files changed, 3 insertions, 1 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 921ae32dbc80..5a66e7ca5d60 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)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2a815560fda0..d7b2caadb292 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2380,8 +2380,8 @@ struct audit_names;
 struct filename {
         const char              *name;  /* pointer to actual string */
         const __user char       *uptr;  /* original userland pointer */
-        struct audit_names      *aname;
         int                     refcnt;
+        struct audit_names      *aname;
         const char              iname[];
 };