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

Alexander Motin mav at FreeBSD.org
Tue Jul 24 13:08:44 UTC 2012


Author: mav
Date: Tue Jul 24 13:08:43 2012
New Revision: 238739
URL: http://svn.freebsd.org/changeset/base/238739

Log:
  Do not call ses_softc_cleanup() in case of configuration read failure.
  Just free inclomplete daemon cache instead to let it retry next time.
  Premature ses_softc_cleanup() caused NULL dereference when freed softc
  was accessed later.

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

Modified: head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_ses.c	Tue Jul 24 04:14:16 2012	(r238738)
+++ head/sys/cam/scsi/scsi_enc_ses.c	Tue Jul 24 13:08:43 2012	(r238739)
@@ -1473,7 +1473,7 @@ ses_process_config(enc_softc_t *enc, str
 
 out:
 	if (err)
-		ses_softc_cleanup(enc);
+		ses_cache_free(enc, enc_cache);
 	else {
 		enc_update_request(enc, SES_UPDATE_GETSTATUS);
 		enc_update_request(enc, SES_UPDATE_GETELMDESCS);


More information about the svn-src-head mailing list