From owner-svn-src-stable-7@FreeBSD.ORG Wed Jun 9 09:51:16 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9635E106564A; Wed, 9 Jun 2010 09:51:16 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 857808FC0C; Wed, 9 Jun 2010 09:51:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o599pGWr083311; Wed, 9 Jun 2010 09:51:16 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o599pGmn083309; Wed, 9 Jun 2010 09:51:16 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201006090951.o599pGmn083309@svn.freebsd.org> From: Andriy Gapon Date: Wed, 9 Jun 2010 09:51:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208940 - stable/7/sys/cam/scsi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 09:51:16 -0000 Author: avg Date: Wed Jun 9 09:51:16 2010 New Revision: 208940 URL: http://svn.freebsd.org/changeset/base/208940 Log: MFC r208800: scsi_cd: pass correct pointer to free() Modified: stable/7/sys/cam/scsi/scsi_cd.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/cam/scsi/scsi_cd.c ============================================================================== --- stable/7/sys/cam/scsi/scsi_cd.c Wed Jun 9 09:44:05 2010 (r208939) +++ stable/7/sys/cam/scsi/scsi_cd.c Wed Jun 9 09:51:16 2010 (r208940) @@ -2523,7 +2523,7 @@ cdioctl(struct disk *dp, u_long cmd, voi error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(¶ms, M_SCSICD); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; }