mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
integrity: move ima_counts_get
Based on discussion on lkml (Andrew Morton and Eric Paris), move ima_counts_get down a layer into shmem/hugetlb__file_setup(). Resolves drm shmem_file_setup() usage case as well. HD comment: I still think you're doing this at the wrong level, but recognize that you probably won't be persuaded until a few more users of alloc_file() emerge, all wanting your ima_counts_get(). Resolving GEM's shmem_file_setup() is an improvement, so I'll say Acked-by: Hugh Dickins <[email protected]> Signed-off-by: Mimi Zohar <[email protected]> Signed-off-by: James Morris <[email protected]>
This commit is contained in:
parent
b9fc745db8
commit
c9d9ac525a
3 changed files with 3 additions and 2 deletions
|
|
@ -2659,6 +2659,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
|
|||
if (error)
|
||||
goto close_file;
|
||||
#endif
|
||||
ima_counts_get(file);
|
||||
return file;
|
||||
|
||||
close_file:
|
||||
|
|
@ -2684,7 +2685,6 @@ int shmem_zero_setup(struct vm_area_struct *vma)
|
|||
if (IS_ERR(file))
|
||||
return PTR_ERR(file);
|
||||
|
||||
ima_counts_get(file);
|
||||
if (vma->vm_file)
|
||||
fput(vma->vm_file);
|
||||
vma->vm_file = file;
|
||||
|
|
|
|||
Loading…
Reference in a new issue