Author: thompsa
Date: Mon Nov 2 23:30:15 2009
New Revision: 198832
URL: http://svn.freebsd.org/changeset/base/198832
Log:
Provide the same sanity check on the sector size in dagetcapacity as when the
disk is first probed. dagetcapacity is called whenever the disk is opened from
geom via d_open(), a zero sector size will cause geom to panic later on.
Modified:
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c Mon Nov 2 23:02:11 2009 (r198831)
+++ head/sys/cam/scsi/scsi_da.c Mon Nov 2 23:30:15 2009 (r198832)
@@ -1948,8 +1948,15 @@ dagetcapacity(struct cam_periph *periph)
done:
- if (error == 0)
- dasetgeom(periph, block_len, maxsector);
+ if (error == 0) {
+ if (block_len >= MAXPHYS || block_len == 0) {
+ xpt_print(periph->path,
+ "unsupportable block size %ju\n",
+ (uintmax_t) block_len);
+ error = EINVAL;
+ } else
+ dasetgeom(periph, block_len, maxsector);
+ }
xpt_release_ccb(ccb);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
