#include "dev_interface.h"
#include "dev_areca.h"
-const char * dev_areca_cpp_cvsid = "$Id: dev_areca.cpp 3803 2013-03-24 18:52:54Z chrfranke $"
+const char * dev_areca_cpp_cvsid = "$Id: dev_areca.cpp 3872 2014-02-03 21:07:51Z chrfranke $"
DEV_ARECA_H_CVSID;
#include "atacmds.h"
// 1 if the command succeeded and disk SMART status is "FAILING"
int generic_areca_device::arcmsr_command_handler(unsigned long arcmsr_cmd, unsigned char *data, int data_len)
{
- unsigned int cmds[] =
+ if (arcmsr_cmd >= ARCMSR_CMD_TOTAL)
+ return -1;
+
+ static const unsigned int cmds[ARCMSR_CMD_TOTAL] =
{
ARCMSR_IOCTL_READ_RQBUFFER,
ARCMSR_IOCTL_WRITE_WQBUFFER,
sBuf.srbioctl.Timeout = 10000;
sBuf.srbioctl.ControlCode = cmds[arcmsr_cmd];
- if(arcmsr_cmd >= ARCMSR_CMD_TOTAL)
- {
- return -1;
- }
-
switch ( arcmsr_cmd )
{
// command for writing data to driver
// ----- BEGIN TO SEND TO ARECA DRIVER ------
expected = arcmsr_ui_handler(areca_packet, areca_packet_len, return_buff);
- if ( expected < 0 )
- {
- return set_err(EIO);
- }
+
+ if (expected < 0)
+ return set_err(EIO, "arcmsr_scsi_pass_through: I/O error");
+ if (expected < 15) // 7 bytes if port is empty
+ return set_err(EIO, "arcmsr_scsi_pass_through: missing data (%d bytes, expected %d)", expected, 15);
int scsi_status = return_buff[5];
int in_data_len = return_buff[11] | return_buff[12] << 8 | return_buff[13] << 16 | return_buff[14] << 24;