Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4fe2448 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

sparc: fix PCI device proc file mmap(2) 



Commit 786d7e16 "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: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61d9b935

fs/proc/inode.c

+16 −0
Original line number Diff line number Diff line
@@ -285,6 +285,20 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma) 
	return rv;

}



static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)

{

	struct proc_dir_entry *pde = PDE(file_inode(file));

	int rv = -EIO;

	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);

	if (use_pde(pde)) {

		get_unmapped_area = pde->proc_fops->get_unmapped_area;

		if (get_unmapped_area)

			rv = get_unmapped_area(file, orig_addr, len, pgoff, flags);

		unuse_pde(pde);

	}

	return rv;

}



static int proc_reg_open(struct inode *inode, struct file *file)

{

	struct proc_dir_entry *pde = PDE(inode);
@@ -356,6 +370,7 @@ static const struct file_operations proc_reg_file_ops = { 
	.compat_ioctl	= proc_reg_compat_ioctl,

#endif

	.mmap		= proc_reg_mmap,

	.get_unmapped_area = proc_reg_get_unmapped_area,

	.open		= proc_reg_open,

	.release	= proc_reg_release,

};
@@ -368,6 +383,7 @@ static const struct file_operations proc_reg_file_ops_no_compat = { 
	.poll		= proc_reg_poll,

	.unlocked_ioctl	= proc_reg_unlocked_ioctl,

	.mmap		= proc_reg_mmap,

	.get_unmapped_area = proc_reg_get_unmapped_area,

	.open		= proc_reg_open,

	.release	= proc_reg_release,

};