From owner-svn-src-all@freebsd.org Sat Mar 24 15:36:26 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3601CF5491D; Sat, 24 Mar 2018 15:36:26 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DFFE571D61; Sat, 24 Mar 2018 15:36:25 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA6141121A; Sat, 24 Mar 2018 15:36:25 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2OFaP9Q098075; Sat, 24 Mar 2018 15:36:25 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2OFaPkw098073; Sat, 24 Mar 2018 15:36:25 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <201803241536.w2OFaPkw098073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Sat, 24 Mar 2018 15:36:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331491 - in head/sys/geom: journal label X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: in head/sys/geom: journal label X-SVN-Commit-Revision: 331491 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Mar 2018 15:36:26 -0000 Author: mckusick Date: Sat Mar 24 15:36:25 2018 New Revision: 331491 URL: https://svnweb.freebsd.org/changeset/base/331491 Log: When freeing a superblock returned by ffs_sbget, be sure to also free the superblock summary information. Reported by: Peter Holm (pho@) Tested by: Peter Holm (pho@) Modified: head/sys/geom/journal/g_journal_ufs.c head/sys/geom/label/g_label_ufs.c Modified: head/sys/geom/journal/g_journal_ufs.c ============================================================================== --- head/sys/geom/journal/g_journal_ufs.c Sat Mar 24 13:51:27 2018 (r331490) +++ head/sys/geom/journal/g_journal_ufs.c Sat Mar 24 15:36:25 2018 (r331491) @@ -83,6 +83,7 @@ g_journal_ufs_dirty(struct g_consumer *cp) fs->fs_clean = 0; fs->fs_flags |= FS_NEEDSFSCK | FS_UNCLEAN; error = ffs_sbput(cp, fs, fs->fs_sblockloc, g_use_g_write_data); + g_free(fs->fs_csp); g_free(fs); if (error != 0) { GJ_DEBUG(0, "Cannot mark file system %s as dirty " Modified: head/sys/geom/label/g_label_ufs.c ============================================================================== --- head/sys/geom/label/g_label_ufs.c Sat Mar 24 13:51:27 2018 (r331490) +++ head/sys/geom/label/g_label_ufs.c Sat Mar 24 15:36:25 2018 (r331491) @@ -103,8 +103,7 @@ g_label_ufs_taste_common(struct g_consumer *cp, char * || G_LABEL_UFS_CMP(pp, fs, fs_providersize))) { /* Valid UFS2. */ } else { - g_free(fs); - return; + goto out; } G_LABEL_DEBUG(1, "%s file system detected on %s.", fs->fs_magic == FS_UFS1_MAGIC ? "UFS1" : "UFS2", pp->name); @@ -120,6 +119,8 @@ g_label_ufs_taste_common(struct g_consumer *cp, char * fs->fs_id[1]); break; } +out: + g_free(fs->fs_csp); g_free(fs); }