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

Commit 2c3c8bea authored by Chris Wright's avatar Chris Wright Committed by Greg Kroah-Hartman
Browse files

sysfs: add struct file* to bin_attr callbacks 



This allows bin_attr->read,write,mmap callbacks to check file specific data
(such as inode owner) as part of any privilege validation.

Signed-off-by: default avatarChris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 68d75ed4

arch/alpha/kernel/pci-sysfs.c

+5 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static int __pci_mmap_fits(struct pci_dev *pdev, int num, 


/**

 * pci_mmap_resource - map a PCI resource into user memory space

 * @filp: open sysfs file

 * @kobj: kobject for mapping

 * @attr: struct bin_attribute for the file being mapped

 * @vma: struct vm_area_struct passed into the mmap
@@ -60,7 +61,8 @@ static int __pci_mmap_fits(struct pci_dev *pdev, int num, 
 *

 * Use the bus mapping routines to map a PCI resource into userspace.

 */

static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,

static int pci_mmap_resource(struct file *filp, struct kobject *kobj,

			     struct bin_attribute *attr,

			     struct vm_area_struct *vma, int sparse)

{

	struct pci_dev *pdev = to_pci_dev(container_of(kobj,
@@ -89,14 +91,14 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, 
	return hose_mmap_page_range(pdev->sysdata, vma, mmap_type, sparse);

}



static int pci_mmap_resource_sparse(struct kobject *kobj,

static int pci_mmap_resource_sparse(struct file *filp, struct kobject *kobj,

				    struct bin_attribute *attr,

				    struct vm_area_struct *vma)

{

	return pci_mmap_resource(kobj, attr, vma, 1);

}



static int pci_mmap_resource_dense(struct kobject *kobj,

static int pci_mmap_resource_dense(struct file *filp, struct kobject *kobj,

				   struct bin_attribute *attr,

				   struct vm_area_struct *vma)

{

arch/mips/txx9/generic/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ struct txx9_sramc_sysdev { 
	void __iomem *base;

};



static ssize_t txx9_sram_read(struct kobject *kobj,

static ssize_t txx9_sram_read(struct file *filp, struct kobject *kobj,

			      struct bin_attribute *bin_attr,

			      char *buf, loff_t pos, size_t size)

{
@@ -920,7 +920,7 @@ static ssize_t txx9_sram_read(struct kobject *kobj, 
	return size;

}



static ssize_t txx9_sram_write(struct kobject *kobj,

static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,

			       struct bin_attribute *bin_attr,

			       char *buf, loff_t pos, size_t size)

{

arch/powerpc/sysdev/mv64x60_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define MV64X60_VAL_LEN_MAX		11

#define MV64X60_PCICFG_CPCI_HOTSWAP	0x68



static ssize_t mv64x60_hs_reg_read(struct kobject *kobj,

static ssize_t mv64x60_hs_reg_read(struct file *filp, struct kobject *kobj,

				   struct bin_attribute *attr, char *buf,

				   loff_t off, size_t count)

{
@@ -45,7 +45,7 @@ static ssize_t mv64x60_hs_reg_read(struct kobject *kobj, 
	return sprintf(buf, "0x%08x\n", v);

}



static ssize_t mv64x60_hs_reg_write(struct kobject *kobj,

static ssize_t mv64x60_hs_reg_write(struct file *filp, struct kobject *kobj,

				    struct bin_attribute *attr, char *buf,

				    loff_t off, size_t count)

{

arch/s390/kernel/ipl.c

+8 −6
Original line number Diff line number Diff line
@@ -403,8 +403,9 @@ static ssize_t sys_ipl_device_show(struct kobject *kobj, 
static struct kobj_attribute sys_ipl_device_attr =

	__ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);



static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,

				  char *buf, loff_t off, size_t count)

static ssize_t ipl_parameter_read(struct file *filp, struct kobject *kobj,

				  struct bin_attribute *attr, char *buf,

				  loff_t off, size_t count)

{

	return memory_read_from_buffer(buf, count, &off, IPL_PARMBLOCK_START,

					IPL_PARMBLOCK_SIZE);
@@ -419,8 +420,9 @@ static struct bin_attribute ipl_parameter_attr = { 
	.read = &ipl_parameter_read,

};



static ssize_t ipl_scp_data_read(struct kobject *kobj, struct bin_attribute *attr,

				 char *buf, loff_t off, size_t count)

static ssize_t ipl_scp_data_read(struct file *filp, struct kobject *kobj,

				 struct bin_attribute *attr, char *buf,

				 loff_t off, size_t count)

{

	unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len;

	void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data;
@@ -694,7 +696,7 @@ static struct kobj_attribute sys_reipl_ccw_vmparm_attr = 


/* FCP reipl device attributes */



static ssize_t reipl_fcp_scpdata_read(struct kobject *kobj,

static ssize_t reipl_fcp_scpdata_read(struct file *filp, struct kobject *kobj,

				      struct bin_attribute *attr,

				      char *buf, loff_t off, size_t count)

{
@@ -704,7 +706,7 @@ static ssize_t reipl_fcp_scpdata_read(struct kobject *kobj, 
	return memory_read_from_buffer(buf, count, &off, scp_data, size);

}



static ssize_t reipl_fcp_scpdata_write(struct kobject *kobj,

static ssize_t reipl_fcp_scpdata_write(struct file *filp, struct kobject *kobj,

				       struct bin_attribute *attr,

				       char *buf, loff_t off, size_t count)

{

drivers/acpi/system.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct acpi_table_attr { 
	struct list_head node;

};



static ssize_t acpi_table_show(struct kobject *kobj,

static ssize_t acpi_table_show(struct file *filp, struct kobject *kobj,

			       struct bin_attribute *bin_attr, char *buf,

			       loff_t offset, size_t count)

{