Commit cdb32706 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Linus Torvalds

plip: fix parport_register_device name parameter

Plip passes a string "name" that is allocated on stack to
parport_register_device.  parport_register_device holds the pointer to
"name" and when the registering function exits, it points nowhere.

On some machine, this bug causes bad names to appear in /proc, such as
/proc/sys/dev/parport/parport0/devices/T^/�X^/�, on others, the plip
proc node is completely missing.

The patch also fixes documentation to note this requirement.
Signed-off-by: default avatarMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6ce5cca
...@@ -339,6 +339,10 @@ Use this function to register your device driver on a parallel port ...@@ -339,6 +339,10 @@ Use this function to register your device driver on a parallel port
('port'). Once you have done that, you will be able to use ('port'). Once you have done that, you will be able to use
parport_claim and parport_release in order to use the port. parport_claim and parport_release in order to use the port.
The ('name') argument is the name of the device that appears in /proc
filesystem. The string must be valid for the whole lifetime of the
device (until parport_unregister_device is called).
This function will register three callbacks into your driver: This function will register three callbacks into your driver:
'preempt', 'wakeup' and 'irq'. Each of these may be NULL in order to 'preempt', 'wakeup' and 'irq'. Each of these may be NULL in order to
indicate that you do not want a callback. indicate that you do not want a callback.
......
...@@ -1269,7 +1269,7 @@ static void plip_attach (struct parport *port) ...@@ -1269,7 +1269,7 @@ static void plip_attach (struct parport *port)
nl = netdev_priv(dev); nl = netdev_priv(dev);
nl->dev = dev; nl->dev = dev;
nl->pardev = parport_register_device(port, name, plip_preempt, nl->pardev = parport_register_device(port, dev->name, plip_preempt,
plip_wakeup, plip_interrupt, plip_wakeup, plip_interrupt,
0, dev); 0, dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment