Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IBM ESDI adapter now handles out-of-range reads/writes.

Browse source
This commit is contained in:
SarahW 2017-12-08 20:11:29 +00:00
commit cd8e5dbd54
1 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/hdd_esdi.c
View file

@ -355,6 +355,25 @@ static void device_not_present(esdi_t *esdi)
esdi_set_irq(esdi); esdi_set_irq(esdi);
} }
static void rba_out_of_range(esdi_t *esdi)
{
esdi->status_len = 9;
esdi->status_data[0] = esdi->command | STATUS_LEN(9) | esdi->cmd_dev;
esdi->status_data[1] = 0x0e01; /*Command block error, invalid parameter*/
esdi->status_data[2] = 0x0007; /*RBA out of range*/
esdi->status_data[3] = 0;
esdi->status_data[4] = 0;
esdi->status_data[5] = 0;
esdi->status_data[6] = 0;
esdi->status_data[7] = 0;
esdi->status_data[8] = 0;
esdi->status = STATUS_IRQ | STATUS_STATUS_OUT_FULL;
esdi->irq_status = esdi->cmd_dev | IRQ_CMD_COMPLETE_FAILURE;
esdi->irq_in_progress = 1;
esdi_set_irq(esdi);
}
#define ESDI_ADAPTER_ONLY() do \ #define ESDI_ADAPTER_ONLY() do \
{ \ { \
if (esdi->cmd_dev != ATTN_HOST_ADAPTER) \ if (esdi->cmd_dev != ATTN_HOST_ADAPTER) \
@ -412,6 +431,12 @@ static void esdi_callback(void *p)
esdi->sector_pos = 0; esdi->sector_pos = 0;
esdi->sector_count = esdi->cmd_data[1]; esdi->sector_count = esdi->cmd_data[1];
if ((esdi->rba + esdi->sector_count) >= hdd_file->sectors)
{
rba_out_of_range(esdi);
return;
}
esdi->status = STATUS_IRQ | STATUS_CMD_IN_PROGRESS | STATUS_TRANSFER_REQ; esdi->status = STATUS_IRQ | STATUS_CMD_IN_PROGRESS | STATUS_TRANSFER_REQ;
esdi->irq_status = esdi->cmd_dev | IRQ_DATA_TRANSFER_READY; esdi->irq_status = esdi->cmd_dev | IRQ_DATA_TRANSFER_READY;
@ -492,6 +517,12 @@ static void esdi_callback(void *p)
esdi->sector_pos = 0; esdi->sector_pos = 0;
esdi->sector_count = esdi->cmd_data[1]; esdi->sector_count = esdi->cmd_data[1];
if ((esdi->rba + esdi->sector_count) >= hdd_file->sectors)
{
rba_out_of_range(esdi);
return;
}
esdi->status = STATUS_IRQ | STATUS_CMD_IN_PROGRESS | STATUS_TRANSFER_REQ; esdi->status = STATUS_IRQ | STATUS_CMD_IN_PROGRESS | STATUS_TRANSFER_REQ;
esdi->irq_status = esdi->cmd_dev | IRQ_DATA_TRANSFER_READY; esdi->irq_status = esdi->cmd_dev | IRQ_DATA_TRANSFER_READY;
esdi->irq_in_progress = 1; esdi->irq_in_progress = 1;
@ -560,6 +591,12 @@ static void esdi_callback(void *p)
return; return;
} }
if ((esdi->rba + esdi->sector_count) >= hdd_file->sectors)
{
rba_out_of_range(esdi);
return;
}
esdi->status = STATUS_IRQ; esdi->status = STATUS_IRQ;
esdi->irq_status = esdi->cmd_dev | IRQ_CMD_COMPLETE_SUCCESS; esdi->irq_status = esdi->cmd_dev | IRQ_CMD_COMPLETE_SUCCESS;
esdi->irq_in_progress = 1; esdi->irq_in_progress = 1;