iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firewire: core: improve check for local node

Browse Source 
My recently added test for a device being local in fw-cdev.c got it
slightly wrong:  Comparisons of node IDs are only valid if the
generation is current, which I forgot to check.  Normally, serialization
by card->lock takes care of this, but a device in FW_DEVICE_GONE state
will necessarily have a wrong generation and invalid node_id.

The "is it local?" check is made 100% correct and simpler now by means
of a struct fw_device flag which is set at fw_device creation.

Besides the fw-cdev site which was to be fixed, there is another site
which can make use of the new flag, and an RFC-2734 driver will benefit
from it too.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter
2009-05-13 21:42:14 +02:00
parent 32a0f488ce
commit 92368890d5
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/firewire/fw-cdev.c
View File

@ -739,15 +739,11 @@ static void release_descriptor(struct client *client,
static int ioctl_add_descriptor(struct client *client, void *buffer) static int ioctl_add_descriptor(struct client *client, void *buffer)
{ {
struct fw_cdev_add_descriptor *request = buffer; struct fw_cdev_add_descriptor *request = buffer;
struct fw_card *card = client->device->card;
struct descriptor_resource *r; struct descriptor_resource *r;
int ret; int ret;
/* Access policy: Allow this ioctl only on local nodes' device files. */ /* Access policy: Allow this ioctl only on local nodes' device files. */
spin_lock_irq(&card->lock); if (!client->device->is_local)
ret = client->device->node_id != card->local_node->node_id;
spin_unlock_irq(&card->lock);
if (ret)
return -ENOSYS; return -ENOSYS;
if (request->length > 256) if (request->length > 256)

3
drivers/firewire/fw-device.c
View File

@ -1042,6 +1042,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
device->node = fw_node_get(node); device->node = fw_node_get(node);
device->node_id = node->node_id; device->node_id = node->node_id;
device->generation = card->generation; device->generation = card->generation;
device->is_local = node == card->local_node;
mutex_init(&device->client_list_mutex); mutex_init(&device->client_list_mutex);
INIT_LIST_HEAD(&device->client_list); INIT_LIST_HEAD(&device->client_list);
@ -1075,7 +1076,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) { FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) {
PREPARE_DELAYED_WORK(&device->work, fw_device_refresh); PREPARE_DELAYED_WORK(&device->work, fw_device_refresh);
schedule_delayed_work(&device->work, schedule_delayed_work(&device->work,
node == card->local_node ? 0 : INITIAL_DELAY); device->is_local ? 0 : INITIAL_DELAY);
} }
break; break;

1
drivers/firewire/fw-device.h
View File

@ -80,6 +80,7 @@ struct fw_device {
u32 *config_rom; u32 *config_rom;
size_t config_rom_length; size_t config_rom_length;
int config_rom_retries; int config_rom_retries;
unsigned is_local:1;
unsigned cmc:1; unsigned cmc:1;
unsigned bc_implemented:2; unsigned bc_implemented:2;