Commit e415e495 authored by Elias Oltmanns's avatar Elias Oltmanns Committed by Bartlomiej Zolnierkiewicz

ide: Two fixes regarding memory allocation

In function ide_devset_execute() we should use __GFP_WAIT rather than
GFP_KERNEL. Also, the allocation cannot possibly fail at that point.
More importantly, there is a potential memory leak in the device probing
code. The infrastructure seems rather complex and I hope I haven't messed
anything up by trying to fix this.
Signed-off-by: default avatarElias Oltmanns <eo@nebensachen.de>
[bart: remove superfluous ide_lock taking]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 06b89518
...@@ -655,10 +655,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting, ...@@ -655,10 +655,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting,
if (!(setting->flags & DS_SYNC)) if (!(setting->flags & DS_SYNC))
return setting->set(drive, arg); return setting->set(drive, arg);
rq = blk_get_request(q, READ, GFP_KERNEL); rq = blk_get_request(q, READ, __GFP_WAIT);
if (!rq)
return -ENOMEM;
rq->cmd_type = REQ_TYPE_SPECIAL; rq->cmd_type = REQ_TYPE_SPECIAL;
rq->cmd_len = 5; rq->cmd_len = 5;
rq->cmd[0] = REQ_DEVSET_EXEC; rq->cmd[0] = REQ_DEVSET_EXEC;
......
...@@ -958,9 +958,9 @@ static void ide_add_drive_to_hwgroup(ide_drive_t *drive) ...@@ -958,9 +958,9 @@ static void ide_add_drive_to_hwgroup(ide_drive_t *drive)
* - allocate the block device queue * - allocate the block device queue
* - link drive into the hwgroup * - link drive into the hwgroup
*/ */
static void ide_port_setup_devices(ide_hwif_t *hwif) static int ide_port_setup_devices(ide_hwif_t *hwif)
{ {
int i; int i, j = 0;
mutex_lock(&ide_cfg_mtx); mutex_lock(&ide_cfg_mtx);
for (i = 0; i < MAX_DRIVES; i++) { for (i = 0; i < MAX_DRIVES; i++) {
...@@ -972,12 +972,19 @@ static void ide_port_setup_devices(ide_hwif_t *hwif) ...@@ -972,12 +972,19 @@ static void ide_port_setup_devices(ide_hwif_t *hwif)
if (ide_init_queue(drive)) { if (ide_init_queue(drive)) {
printk(KERN_ERR "ide: failed to init %s\n", printk(KERN_ERR "ide: failed to init %s\n",
drive->name); drive->name);
kfree(drive->id);
drive->id = NULL;
drive->dev_flags &= ~IDE_DFLAG_PRESENT;
continue; continue;
} }
j++;
ide_add_drive_to_hwgroup(drive); ide_add_drive_to_hwgroup(drive);
} }
mutex_unlock(&ide_cfg_mtx); mutex_unlock(&ide_cfg_mtx);
return j;
} }
static ide_hwif_t *ide_ports[MAX_HWIFS]; static ide_hwif_t *ide_ports[MAX_HWIFS];
...@@ -1663,10 +1670,13 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, ...@@ -1663,10 +1670,13 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
continue; continue;
} }
j++;
if (hwif->present) if (hwif->present)
ide_port_setup_devices(hwif); if (ide_port_setup_devices(hwif) == 0) {
hwif->present = 0;
continue;
}
j++;
ide_acpi_init(hwif); ide_acpi_init(hwif);
......
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