svn commit: r250967 - head/sys/cam/scsi

[Steven Hartland]

Author: smh
Date: Fri May 24 11:27:06 2013
New Revision: 250967
URL: http://svnweb.freebsd.org/changeset/base/250967

Log:
  Enforce validation on the selected delete method via sysctl.
  
  This prevents users from selecting a delete method which may cause
  corruption e.g. MPS WS16 on pre P14 firmware.
  
  Reviewed by:	pjd (mentor)
  Approved by:	pjd (mentor)
  MFC after:	2 days

Modified:
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Fri May 24 09:48:42 2013	(r250966)
+++ head/sys/cam/scsi/scsi_da.c	Fri May 24 11:27:06 2013	(r250967)
@@ -1780,7 +1780,8 @@ dadeletemethodsysctl(SYSCTL_HANDLER_ARGS
 	if (error != 0 || req->newptr == NULL)
 		return (error);
 	for (i = 0; i <= DA_DELETE_MAX; i++) {
-		if (strcmp(buf, da_delete_method_names[i]) != 0)
+		if (!(softc->delete_available & (1 << i)) ||
+		    strcmp(buf, da_delete_method_names[i]) != 0)
 			continue;
 		dadeletemethodset(softc, i);
 		return (0);