i2c: Let the user specify PCI driver data through new_id
PATCH 1/1 i2c: Let the user specify PCI driver data through new_id
The i2c-amd756 and i2c-viapro drivers make use of the driver_data field of the PCI device ID. When adding device IDs dynamically (by writing to the new_id sysfs file) you cannot set the value of this field by default. It has to be allowed explicitly. Do that, and check the value so that the user can't crash the kernel accidentally.
--- drivers/i2c/busses/i2c-amd756.c | 5 +++++ drivers/i2c/busses/i2c-viapro.c | 5 +++++ 2 files changed, 10 insertions(+)
drivers/i2c/busses/i2c-amd756.c +5 -0
@@ -334,6 +334,10 @@ static int __devinit amd756_probe(structint error;u8 temp; +/* driver_data might come from user-space, so check it */ +if (id->driver_data >ARRAY_SIZE (chipname)) +return -EINVAL ; +if (amd756_ioport) {dev_err (&pdev->dev,"Only one device supported " "(you have a strange motherboard, btw)\n" );
@@ -405,6 +409,7 @@ static struct pci_driver amd756_driver = .id_table = amd756_ids, .probe = amd756_probe, .remove = __devexit_p(amd756_remove), + .dynids.use_driver_data = 1, };static int __init amd756_init (void )
drivers/i2c/busses/i2c-viapro.c +5 -0
@@ -318,6 +318,10 @@ static int __devinit vt596_probe(structunsigned char temp;int error = -ENODEV ; +/* driver_data might come from user-space, so check it */ +if (id->driver_data &1 || id->driver_data >0xff ) +return -EINVAL ; +/* Determine the address of the SMBus areas */ if (force_addr) { vt596_smba = force_addr &0xfff0 ;
@@ -455,6 +459,7 @@ static struct pci_driver vt596_driver = .name = "vt596_smbus", .id_table = vt596_ids, .probe = vt596_probe, + .dynids.use_driver_data = 1, };static int __init i2c_vt596_init (void )
Signature · 6 lines
Jean Delvare _______________________________________________ i2c mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/i2c
A message that is not in the archive (sent off-list or not yet received): [email protected]
Greg KH
Acked-byQuoted 7 lines · Jean Delvare
The i2c-amd756 and i2c-viapro drivers make use of the
driver_datafield of the PCI device ID. When adding device IDs dynamically (by writing to thenew_idsysfs file) you cannot set the value of this field by default. It has to be allowed explicitly. Do that, and check the value so that the user can't crash the kernel accidentally.Signed-off-by Jean Delvare <[email protected]>
_______________________________________________
i2c mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/i2c