d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of Coverity Unintended sign extension sign extension

Browse Source 
defects.  When shifting an unsigned byte into the upper 8 bits of
an int and the resulting value is greater than 0x7FFFFFF, the result
will be sign extended when converting to a 64 bit unsigned long.
Fix by casting to (uint64_t) before the shift.

Reported by:	Coverity
CID:		1356044, 1356045
Reviewed by:	ken
This commit is contained in:
Don Lewis 2016-05-25 15:49:29 +00:00
parent 4992a19282
commit e60dd0e86a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/camcontrol/camcontrol.c
View File

@ -5188,7 +5188,7 @@ get_ata_status(struct cam_device *dev, union ccb *ccb, uint8_t *error,
desc->count_7_0; desc->count_7_0;
*lba = ((uint64_t)desc->lba_47_40 << 40) | *lba = ((uint64_t)desc->lba_47_40 << 40) |
((uint64_t)desc->lba_39_32 << 32) | ((uint64_t)desc->lba_39_32 << 32) |
(desc->lba_31_24 << 24) | ((uint64_t)desc->lba_31_24 << 24) |
(desc->lba_23_16 << 16) | (desc->lba_23_16 << 16) |
(desc->lba_15_8 << 8) | (desc->lba_15_8 << 8) |
desc->lba_7_0; desc->lba_7_0;
@ -5249,7 +5249,7 @@ get_ata_status(struct cam_device *dev, union ccb *ccb, uint8_t *error,
(res->lba_low); (res->lba_low);
if (res->flags & CAM_ATAIO_48BIT) { if (res->flags & CAM_ATAIO_48BIT) {
*count |= (res->sector_count_exp << 8); *count |= (res->sector_count_exp << 8);
*lba |= (res->lba_low_exp << 24) | *lba |= ((uint64_t)res->lba_low_exp << 24) |
((uint64_t)res->lba_mid_exp << 32) | ((uint64_t)res->lba_mid_exp << 32) |
((uint64_t)res->lba_high_exp << 40); ((uint64_t)res->lba_high_exp << 40);
} else { } else {