diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-31 17:32:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-31 17:32:40 +1100 |
| commit | beaddd44985f98441bcdd5c624aa02261f6f9172 (patch) | |
| tree | 1131dac428980e6fe308c855fa742f2acfae81d2 /security | |
| parent | 5531763966e65d7b7d0e57feb9dae2d2d26c5ebe (diff) | |
| parent | f40364e40a57d18ae1ed163502e361ba814fa2ea (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/selinuxfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index c354807381c1..c9e8a9898ce4 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -424,10 +424,9 @@ out: return ret; } -static int sel_mmap_policy_fault(struct vm_area_struct *vma, - struct vm_fault *vmf) +static int sel_mmap_policy_fault(struct vm_fault *vmf) { - struct policy_load_memory *plm = vma->vm_file->private_data; + struct policy_load_memory *plm = vmf->vma->vm_file->private_data; unsigned long offset; struct page *page; |