libata: zpodd: Fix small read overflow in zpodd_get_mech_type()
PATCH 1/1 libata: zpodd: Fix small read overflow in zpodd_get_mech_type()
Much like commit 18c9a99bce2a ("libata: zpodd: small read overflow in eject_tray()"), this fixes a cdb[] buffer length, this time in zpodd_get_mech_type():
We read from the cdb[] buffer in ata_exec_internal_sg(). It has to be ATAPI_CDB_LEN (16) bytes long, but this buffer is only 12 bytes.
The KASAN report was:
BUG: KASAN: global-out-of-bounds in ata_exec_internal_sg+0x50f/0xc70 Read of size 16 at addr ffffffff91f41f80 by task scsi_eh_1/149 ... The buggy address belongs to the variable: cdb.48319+0x0/0x40
--- drivers/ata/libata-zpodd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-zpodd.c +1 -1
@@ -56,7 +56,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)unsigned int ret;struct rm_feature_desc *desc;struct ata_taskfile tf; -static const char cdb[] = {GPCMD_GET_CONFIGURATION , +static const char cdb[ATAPI_CDB_LEN ] = {GPCMD_GET_CONFIGURATION ,2 ,/* only 1 feature descriptor requested */ 0 ,3 ,/* 3, removable medium feature */ 0 ,0 ,0 ,/* reserved */
Signature · 5 lines
2.17.1 -- Kees Cook
Quoted 16 lines · Kees Cook
Much like commit
18c9a99bce2a("libata: zpodd: small read overflow ineject_tray()"), this fixes a cdb[] buffer length, this time inzpodd_get_mech_type():We read from the cdb[] buffer in
ata_exec_internal_sg(). It has to beATAPI_CDB_LEN(16) bytes long, but this buffer is only 12 bytes.The KASAN report was:
BUG: KASAN: global-out-of-bounds in ata_exec_internal_sg+0x50f/0xc70 Read of size 16 at addr ffffffff91f41f80 by task scsi_eh_1/149 ... The buggy address belongs to the variable: cdb.48319+0x0/0x40
Quoted 3 lines
Reported-by Jeffrin Thalakkottoor <[email protected]>Fixes afe759511808c ("libata: identify and init ZPODD devices")Signed-off-by Kees Cook <[email protected]>
Interesting, both initializer lists are less than ATAPI_CDB_LEN (16) elements, yet ata_exec_internal_sg() in drivers/ata/libata-core.c very clearly has a ATAPI_CDB_LEN byte memcpy on that element. Probably both initializer lists should just lead off the trailing zero's or provide the entire 16 elements. For now, thank you for the patch.
Quoted 23 lines
--- drivers/ata/libata-zpodd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/ata/libata-zpodd.c +1
-2@@ -56,7 +56,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)unsigned int ret;struct rm_feature_desc *desc;struct ata_taskfile tf; -static const char cdb[] = {GPCMD_GET_CONFIGURATION , +static const char cdb[ATAPI_CDB_LEN ] = {GPCMD_GET_CONFIGURATION ,2 ,/* only 1 feature descriptor requested */ 0 ,3 ,/* 3, removable medium feature */ 0 ,0 ,0 ,/* reserved */ --2.17.1
--
Kees Cook
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 21 lines · Nick Desaulniers
Quoted 16 lines · Kees Cook
Much like commit
18c9a99bce2a("libata: zpodd: small read overflow ineject_tray()"), this fixes a cdb[] buffer length, this time inzpodd_get_mech_type():We read from the cdb[] buffer in
ata_exec_internal_sg(). It has to beATAPI_CDB_LEN(16) bytes long, but this buffer is only 12 bytes.The KASAN report was:
BUG: KASAN: global-out-of-bounds in ata_exec_internal_sg+0x50f/0xc70 Read of size 16 at addr ffffffff91f41f80 by task scsi_eh_1/149 ... The buggy address belongs to the variable: cdb.48319+0x0/0x40Quoted 3 lines
Reported-by Jeffrin Thalakkottoor <[email protected]>Fixes afe759511808c ("libata: identify and init ZPODD devices")Signed-off-by Kees Cook <[email protected]>
Quoted 5 lines
Interesting, both initializer lists are less than
ATAPI_CDB_LEN(16) elements, yetata_exec_internal_sg()indrivers/ata/libata-core.cvery clearly has aATAPI_CDB_LENbyte memcpy on that element. Probably both initializer lists should just lead off the trailing zero's or provide the entire 16 elements. For now, thank you for the patch.
Yup, with the specific size added it'll be zero-padded.
Quoted 1 line
Reviewed-by Nick Desaulniers <[email protected]>
Thanks!
-Kees
Quoted 30 lines
Quoted 24 lines
--- drivers/ata/libata-zpodd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/ata/libata-zpodd.c +1
-2@@ -56,7 +56,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)unsigned int ret;struct rm_feature_desc *desc;struct ata_taskfile tf; -static const char cdb[] = {GPCMD_GET_CONFIGURATION , +static const char cdb[ATAPI_CDB_LEN ] = {GPCMD_GET_CONFIGURATION ,2 ,/* only 1 feature descriptor requested */ 0 ,3 ,/* 3, removable medium feature */ 0 ,0 ,0 ,/* reserved */ --2.17.1
--
Kees CookSignature · 2 lines
Thanks, ~Nick Desaulniers
Signature · 1 line
Kees Cook