proc: merge fix for proc_pident_lookup() API change

Link: http://lkml.kernel.org/r/20190131160135.4a8ae70b@canb.auug.org.au
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Morris <jmorris@namei.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 775a873..5e5576d 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2612,7 +2612,7 @@ static struct dentry *proc_##LSM##_attr_dir_lookup(struct inode *dir, \
 { \
        return proc_pident_lookup(dir, dentry, \
                                  LSM##_attr_dir_stuff, \
-                                 ARRAY_SIZE(LSM##_attr_dir_stuff)); \
+                                 LSM##_attr_dir_stuff + ARRAY_SIZE(LSM##_attr_dir_stuff)); \
 } \
 \
 static const struct inode_operations proc_##LSM##_attr_dir_inode_ops = { \