diff options
author | David Howells <dhowells@redhat.com> | 2018-06-13 20:43:19 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-06-15 06:48:57 +0200 |
commit | 24074a35c5c975c94cd9691ae962855333aac47f (patch) | |
tree | 1b59ef017c85f158edf696564fe441fa2356ca3e /fs/proc/internal.h | |
parent | Merge tag 'afs-fixes-20180514' into afs-proc (diff) | |
download | linux-24074a35c5c975c94cd9691ae962855333aac47f.tar.xz linux-24074a35c5c975c94cd9691ae962855333aac47f.zip |
proc: Make inline name size calculation automatic
Make calculation of the size of the inline name in struct proc_dir_entry
automatic, rather than having to manually encode the numbers and failing to
allow for lockdep.
Require a minimum inline name size of 33+1 to allow for names that look
like two hex numbers with a dash between.
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc/internal.h')
-rw-r--r-- | fs/proc/internal.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 916ccc39073d..d8d11fd9fdb0 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -62,14 +62,20 @@ struct proc_dir_entry { char *name; umode_t mode; u8 namelen; -#ifdef CONFIG_64BIT -#define SIZEOF_PDE_INLINE_NAME (192-155) -#else -#define SIZEOF_PDE_INLINE_NAME (128-95) -#endif - char inline_name[SIZEOF_PDE_INLINE_NAME]; + char inline_name[]; } __randomize_layout; +#define OFFSETOF_PDE_NAME offsetof(struct proc_dir_entry, inline_name) +#define SIZEOF_PDE_SLOT \ + (OFFSETOF_PDE_NAME + 34 <= 64 ? 64 : \ + OFFSETOF_PDE_NAME + 34 <= 128 ? 128 : \ + OFFSETOF_PDE_NAME + 34 <= 192 ? 192 : \ + OFFSETOF_PDE_NAME + 34 <= 256 ? 256 : \ + OFFSETOF_PDE_NAME + 34 <= 512 ? 512 : \ + 0) + +#define SIZEOF_PDE_INLINE_NAME (SIZEOF_PDE_SLOT - OFFSETOF_PDE_NAME) + extern struct kmem_cache *proc_dir_entry_cache; void pde_free(struct proc_dir_entry *pde); |