diff options
| author | Jody McIntyre <scjody@steamballoon.com> | 2005-11-22 18:17:11 +0100 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-22 18:17:11 +0100 |
| commit | 5303a986c33ae6c75d5ffb57d06ccf9246a8725a (patch) | |
| tree | 9e305aeba9188fd0693be26a96ff1eb2efa09cbe /drivers/ieee1394/csr1212.c | |
| parent | raw1394: fix memory deallocation in modify_config_rom (diff) | |
| download | linux-5303a986c33ae6c75d5ffb57d06ccf9246a8725a.tar.xz linux-5303a986c33ae6c75d5ffb57d06ccf9246a8725a.zip | |
csr1212: check results of keyval reads
csr1212_parse_csr() did not properly check return values when reading
keyvals. Fix this by using _csr1212_read_keyval() instead of
csr1212_get_keyval() and checking the return code.
Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Diffstat (limited to 'drivers/ieee1394/csr1212.c')
| -rw-r--r-- | drivers/ieee1394/csr1212.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c index c0f8ed6fca8a..4812d59e8976 100644 --- a/drivers/ieee1394/csr1212.c +++ b/drivers/ieee1394/csr1212.c @@ -1610,15 +1610,16 @@ int csr1212_parse_csr(struct csr1212_csr *csr) csr->root_kv->valid = 0; csr->root_kv->next = csr->root_kv; csr->root_kv->prev = csr->root_kv; - csr1212_get_keyval(csr, csr->root_kv); + ret = _csr1212_read_keyval(csr, csr->root_kv); + if (ret != CSR1212_SUCCESS) + return ret; /* Scan through the Root directory finding all extended ROM regions * and make cache regions for them */ for (dentry = csr->root_kv->value.directory.dentries_head; dentry; dentry = dentry->next) { if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM) { - csr1212_get_keyval(csr, dentry->kv); - + ret = _csr1212_read_keyval(csr, dentry->kv); if (ret != CSR1212_SUCCESS) return ret; } |