aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2013-08-20 15:17:24 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-05 15:12:51 -0400
commitc4fe24485729fc2cbff324c111e67a1cc2f9adea (patch)
tree26b45b77ad4ff49ae8f3af13a12f190439e53010 /fs/proc
parent61d9b9355b0d427bd1e732bd54628ff9103e496f (diff)
sparc: fix PCI device proc file mmap(2)
Commit 786d7e1612f0b0adb6046f19b906609e4fe8b1ba "Fix rmmod/read/write races in /proc entries" must have broken mmapping of PCI device proc files on Sparc. Notice how it adds wrapper around ->mmap but doesn't do it around ->get_unmapped_area. Add wrapper around ->get_unmapped_area. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/inode.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 073aea60cf8f..9f8ef9b7674d 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -285,6 +285,20 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma)
285 return rv; 285 return rv;
286} 286}
287 287
288static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)
289{
290 struct proc_dir_entry *pde = PDE(file_inode(file));
291 int rv = -EIO;
292 unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
293 if (use_pde(pde)) {
294 get_unmapped_area = pde->proc_fops->get_unmapped_area;
295 if (get_unmapped_area)
296 rv = get_unmapped_area(file, orig_addr, len, pgoff, flags);
297 unuse_pde(pde);
298 }
299 return rv;
300}
301
288static int proc_reg_open(struct inode *inode, struct file *file) 302static int proc_reg_open(struct inode *inode, struct file *file)
289{ 303{
290 struct proc_dir_entry *pde = PDE(inode); 304 struct proc_dir_entry *pde = PDE(inode);
@@ -356,6 +370,7 @@ static const struct file_operations proc_reg_file_ops = {
356 .compat_ioctl = proc_reg_compat_ioctl, 370 .compat_ioctl = proc_reg_compat_ioctl,
357#endif 371#endif
358 .mmap = proc_reg_mmap, 372 .mmap = proc_reg_mmap,
373 .get_unmapped_area = proc_reg_get_unmapped_area,
359 .open = proc_reg_open, 374 .open = proc_reg_open,
360 .release = proc_reg_release, 375 .release = proc_reg_release,
361}; 376};
@@ -368,6 +383,7 @@ static const struct file_operations proc_reg_file_ops_no_compat = {
368 .poll = proc_reg_poll, 383 .poll = proc_reg_poll,
369 .unlocked_ioctl = proc_reg_unlocked_ioctl, 384 .unlocked_ioctl = proc_reg_unlocked_ioctl,
370 .mmap = proc_reg_mmap, 385 .mmap = proc_reg_mmap,
386 .get_unmapped_area = proc_reg_get_unmapped_area,
371 .open = proc_reg_open, 387 .open = proc_reg_open,
372 .release = proc_reg_release, 388 .release = proc_reg_release,
373}; 389};