svn commit: r327849 - stable/11/sys/cam/ata

[Alan Somers]

Author: asomers
Date: Thu Jan 11 23:56:55 2018
New Revision: 327849
URL: https://svnweb.freebsd.org/changeset/base/327849

Log:
  MFC r326624:
  
  cam: fix sign-extension error in adagetparams
  
  adagetparams contains a sign-extension error that will cause the sector
  count to be incorrectly calculated for ATA disks of >=1TiB that still use
  CHS addressing. Disks using LBA48 addressing are unaffected.
  
  Reported by:	Coverity
  CID:		1007296
  Reviewed by:	ken
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D13198

Modified:
  stable/11/sys/cam/ata/ata_da.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/ata/ata_da.c
==============================================================================
--- stable/11/sys/cam/ata/ata_da.c	Thu Jan 11 23:56:01 2018	(r327848)
+++ stable/11/sys/cam/ata/ata_da.c	Thu Jan 11 23:56:55 2018	(r327849)
@@ -3328,7 +3328,8 @@ adagetparams(struct cam_periph *periph, struct ccb_get
 		dp->heads = cgd->ident_data.heads;
 		dp->secs_per_track = cgd->ident_data.sectors;
 		dp->cylinders = cgd->ident_data.cylinders;
-		dp->sectors = cgd->ident_data.cylinders * dp->heads * dp->secs_per_track;  
+		dp->sectors = cgd->ident_data.cylinders *
+			      (u_int32_t)(dp->heads * dp->secs_per_track);  
 	}
 	lbasize = (u_int32_t)cgd->ident_data.lba_size_1 |
 		  ((u_int32_t)cgd->ident_data.lba_size_2 << 16);