From owner-svn-src-all@FreeBSD.ORG  Tue Jul 24 13:08:44 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0A47E1065674;
	Tue, 24 Jul 2012 13:08:44 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E9AB68FC20;
	Tue, 24 Jul 2012 13:08:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6OD8hZ5032970;
	Tue, 24 Jul 2012 13:08:43 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6OD8hIV032968;
	Tue, 24 Jul 2012 13:08:43 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201207241308.q6OD8hIV032968@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 24 Jul 2012 13:08:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238739 - head/sys/cam/scsi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jul 2012 13:08:44 -0000

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);