Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

machine/spi_sdcard.cpp: fix write data leaking into cmd buffer #12249

Merged
merged 2 commits into from
Apr 16, 2024
Merged

machine/spi_sdcard.cpp: fix write data leaking into cmd buffer #12249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cac2d26
machine/spi_sdcard.cpp: fix write data leaking into cmd buffer
holub Apr 14, 2024
b694b34
refactoring
holub Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 23 additions & 44 deletions src/devices/machine/spi_sdcard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,28 +136,17 @@ void spi_sdcard_device::latch_in()
if (m_cur_bit == 8)
{
LOGMASKED(LOG_SPI, "SDCARD: got %02x\n", m_in_latch);
for (u8 i = 0; i < 5; i++)
if (m_state == SD_STATE_WRITE_WAITFE)
{
m_cmd[i] = m_cmd[i + 1];
}
m_cmd[5] = m_in_latch;

switch (m_state)
{
case SD_STATE_IDLE:
do_command();
break;

case SD_STATE_WRITE_WAITFE:
if (m_in_latch == 0xfe)
{
m_state = SD_STATE_WRITE_DATA;
m_out_latch = 0xff;
m_write_ptr = 0;
}
break;

case SD_STATE_WRITE_DATA:
}
else if (m_state == SD_STATE_WRITE_DATA)
{
m_data[m_write_ptr++] = m_in_latch;
if (m_write_ptr == (m_blksize + 2))
{
Expand All @@ -174,26 +163,28 @@ void spi_sdcard_device::latch_in()

send_data(2, SD_STATE_IDLE);
}
break;
}
else // receive CMD
{
std::memmove(m_cmd, m_cmd + 1, 5);
m_cmd[5] = m_in_latch;

case SD_STATE_DATA_MULTI:
do_command();
if (m_state == SD_STATE_DATA_MULTI && m_out_count == 0)
if (m_state == SD_STATE_DATA_MULTI)
{
m_data[0] = 0xfe; // data token
m_image->read(m_blknext++, &m_data[1]);
util::crc16_t crc16 = util::crc16_creator::simple(&m_data[1], m_blksize);
put_u16be(&m_data[m_blksize + 1], crc16);
send_data(1 + m_blksize + 2, SD_STATE_DATA_MULTI);
do_command();
if (m_state == SD_STATE_DATA_MULTI && m_out_count == 0)
{
m_data[0] = 0xfe; // data token
m_image->read(m_blknext++, &m_data[1]);
util::crc16_t crc16 = util::crc16_creator::simple(&m_data[1], m_blksize);
put_u16be(&m_data[m_blksize + 1], crc16);
send_data(1 + m_blksize + 2, SD_STATE_DATA_MULTI);
}
}
break;

default:
if (((m_cmd[0] & 0x70) == 0x40) || (m_out_count == 0)) // CMD0 - GO_IDLE_STATE
else if ((m_state == SD_STATE_IDLE) || (((m_cmd[0] & 0x70) == 0x40) || (m_out_count == 0))) // CMD0 - GO_IDLE_STATE
{
do_command();
}
break;
}
}
}
Expand Down Expand Up @@ -445,28 +436,16 @@ void spi_sdcard_device::do_command()
break;

default:
LOGMASKED(LOG_COMMAND, "SDCARD: Unsupported %02x\n", m_cmd[0] & 0x3f);
LOGMASKED(LOG_COMMAND, "SDCARD: Unsupported CMD%02d\n", m_cmd[0] & 0x3f);
clean_cmd = false;
break;
}

// if this is command 55, that's a prefix indicating the next command is an "app command" or "ACMD"
if ((m_cmd[0] & 0x3f) == 55)
{
m_bACMD = true;
}
else
{
m_bACMD = false;
}
m_bACMD = (m_cmd[0] & 0x3f) == 55;

if (clean_cmd)
{
for (u8 i = 0; i < 6; i++)
{
m_cmd[i] = 0xff;
}
}
memset(m_cmd, 0xff, 6);
}
}

Expand Down