diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index 513c387..895e5f2 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -192,6 +192,7 @@ iscsi_test_cu_SOURCES = iscsi-test-cu.c \ test_writesame10_unmap_until_end.c \ test_writesame10_unmap_vpd.c \ test_writesame10_check.c \ + test_writesame10_invalid_dataout_size.c \ test_writesame16_simple.c \ test_writesame16_beyond_eol.c \ test_writesame16_0blocks.c \ @@ -201,6 +202,7 @@ iscsi_test_cu_SOURCES = iscsi-test-cu.c \ test_writesame16_unmap_until_end.c \ test_writesame16_unmap_vpd.c \ test_writesame16_check.c \ + test_writesame16_invalid_dataout_size.c \ test_writeverify10_simple.c \ test_writeverify10_beyond_eol.c \ test_writeverify10_0blocks.c \ diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index 26c14f3..aac0f26 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -35,6 +35,7 @@ extern const char *initiatorname1; extern const char *initiatorname2; #define EXPECT_STATUS_GOOD SCSI_STATUS_GOOD, SCSI_SENSE_NO_SENSE, NULL, 0 +#define EXPECT_STATUS_GENERIC_BAD SCSI_STATUS_CHECK_CONDITION, SCSI_SENSE_ILLEGAL_REQUEST, NULL, 0 #define EXPECT_STATUS_TIMEOUT SCSI_STATUS_TIMEOUT, SCSI_SENSE_NO_SENSE, NULL, 0 #define EXPECT_NO_MEDIUM SCSI_STATUS_CHECK_CONDITION, SCSI_SENSE_NOT_READY, no_medium_ascqs, 3 #define EXPECT_LBA_OOB SCSI_STATUS_CHECK_CONDITION, SCSI_SENSE_ILLEGAL_REQUEST, lba_oob_ascqs, 1 diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c index 764ec9d..e432040 100644 --- a/test-tool/iscsi-test-cu.c +++ b/test-tool/iscsi-test-cu.c @@ -421,6 +421,7 @@ static CU_TestInfo tests_writesame10[] = { { (char *)"UnmapUntilEnd", test_writesame10_unmap_until_end }, { (char *)"UnmapVPD", test_writesame10_unmap_vpd }, { (char *)"Check", test_writesame10_check }, + { (char *)"InvalidDataOutSize", test_writesame10_invalid_dataout_size }, CU_TEST_INFO_NULL }; @@ -434,6 +435,7 @@ static CU_TestInfo tests_writesame16[] = { { (char *)"UnmapUntilEnd", test_writesame16_unmap_until_end }, { (char *)"UnmapVPD", test_writesame16_unmap_vpd }, { (char *)"Check", test_writesame16_check }, + { (char *)"InvalidDataOutSize", test_writesame16_invalid_dataout_size }, CU_TEST_INFO_NULL }; diff --git a/test-tool/iscsi-test-cu.h b/test-tool/iscsi-test-cu.h index e2a8927..9c2ef10 100644 --- a/test-tool/iscsi-test-cu.h +++ b/test-tool/iscsi-test-cu.h @@ -274,6 +274,7 @@ void test_writesame10_unmap_unaligned(void); void test_writesame10_unmap_until_end(void); void test_writesame10_unmap_vpd(void); void test_writesame10_check(void); +void test_writesame10_invalid_dataout_size(void); void test_writesame16_simple(void); void test_writesame16_beyond_eol(void); @@ -284,6 +285,7 @@ void test_writesame16_unmap_unaligned(void); void test_writesame16_unmap_until_end(void); void test_writesame16_unmap_vpd(void); void test_writesame16_check(void); +void test_writesame16_invalid_dataout_size(void); void test_writeverify10_simple(void); void test_writeverify10_beyond_eol(void); diff --git a/test-tool/test_writesame10_invalid_dataout_size.c b/test-tool/test_writesame10_invalid_dataout_size.c new file mode 100644 index 0000000..f521908 --- /dev/null +++ b/test-tool/test_writesame10_invalid_dataout_size.c @@ -0,0 +1,54 @@ +/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ +/* + Copyright (C) 2013 Ronnie Sahlberg + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . +*/ + +#include + +#include + +#include "iscsi.h" +#include "scsi-lowlevel.h" +#include "iscsi-support.h" +#include "iscsi-test-cu.h" + + +void +test_writesame10_invalid_dataout_size(void) +{ + CHECK_FOR_DATALOSS; + CHECK_FOR_THIN_PROVISIONING; + CHECK_FOR_LBPWS10; + CHECK_FOR_LBPPB_GT_1; + CHECK_FOR_SBC; + + logging(LOG_VERBOSE, LOG_BLANK_LINE); + logging(LOG_VERBOSE, "Test that WRITESAME10 fails for invalid " + "(too small/too large) DataOut sizes."); + memset(scratch, 0xa6, block_size); + + logging(LOG_VERBOSE, "Check too small DataOut"); + logging(LOG_VERBOSE, "Unmap with DataOut==%ld (block_size==%ld)", + block_size / 2, block_size); + WRITESAME10(sd, 0, block_size / 2, 1, 0, 1, 0, 0, scratch, + EXPECT_STATUS_GENERIC_BAD); + + logging(LOG_VERBOSE, "Check too large DataOut"); + logging(LOG_VERBOSE, "Unmap with DataOut==%ld (block_size==%ld)", + block_size * 2, block_size); + WRITESAME10(sd, 0, block_size * 2, 1, 0, 1, 0, 0, scratch, + EXPECT_STATUS_GENERIC_BAD); +} diff --git a/test-tool/test_writesame16_invalid_dataout_size.c b/test-tool/test_writesame16_invalid_dataout_size.c new file mode 100644 index 0000000..128673f --- /dev/null +++ b/test-tool/test_writesame16_invalid_dataout_size.c @@ -0,0 +1,54 @@ +/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ +/* + Copyright (C) 2013 Ronnie Sahlberg + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . +*/ + +#include + +#include + +#include "iscsi.h" +#include "scsi-lowlevel.h" +#include "iscsi-support.h" +#include "iscsi-test-cu.h" + + +void +test_writesame16_invalid_dataout_size(void) +{ + CHECK_FOR_DATALOSS; + CHECK_FOR_THIN_PROVISIONING; + CHECK_FOR_LBPWS10; + CHECK_FOR_LBPPB_GT_1; + CHECK_FOR_SBC; + + logging(LOG_VERBOSE, LOG_BLANK_LINE); + logging(LOG_VERBOSE, "Test that WRITESAME10 fails for invalid " + "(too small/too large) DataOut sizes."); + memset(scratch, 0xa6, block_size); + + logging(LOG_VERBOSE, "Check too small DataOut"); + logging(LOG_VERBOSE, "Unmap with DataOut==%ld (block_size==%ld)", + block_size / 2, block_size); + WRITESAME16(sd, 0, block_size / 2, 1, 0, 1, 0, 0, scratch, + EXPECT_STATUS_GENERIC_BAD); + + logging(LOG_VERBOSE, "Check too large DataOut"); + logging(LOG_VERBOSE, "Unmap with DataOut==%ld (block_size==%ld)", + block_size * 2, block_size); + WRITESAME16(sd, 0, block_size * 2, 1, 0, 1, 0, 0, scratch, + EXPECT_STATUS_GENERIC_BAD); +}