Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  selinux: make mls_compute_sid always polyinstantiate
  security/selinux: constify function pointer tables and fields
  security: add a secctx_to_secid() hook
  security: call security_file_permission from rw_verify_area
  security: remove security_sb_post_mountroot hook
  Security: remove security.h include from mm.h
  Security: remove security_file_mmap hook sparse-warnings (NULL as 0).
  Security: add get, set, and cloning of superblock security information
  security/selinux: Add missing "space"

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 15678aa6ec73..bfa389fc6ded 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1620,7 +1620,7 @@ static inline int expand_downwards(struct vm_area_struct *vma,
                 return -ENOMEM;
 
         address &= PAGE_MASK;
-        error = security_file_mmap(0, 0, 0, 0, address, 1);
+        error = security_file_mmap(NULL, 0, 0, 0, address, 1);
         if (error)
                 return error;
 
@@ -1941,7 +1941,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
         if (is_hugepage_only_range(mm, addr, len))
                 return -EINVAL;
 
-        error = security_file_mmap(0, 0, 0, 0, addr, 1);
+        error = security_file_mmap(NULL, 0, 0, 0, addr, 1);
         if (error)
                 return error;