From owner-svn-src-head@freebsd.org Wed Apr 20 21:32:35 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B863B15956; Wed, 20 Apr 2016 21:32:35 +0000 (UTC) (envelope-from bapt@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 mx1.freebsd.org (Postfix) with ESMTPS id 123C513AC; Wed, 20 Apr 2016 21:32:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3KLWYBd096651; Wed, 20 Apr 2016 21:32:34 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3KLWYMK096650; Wed, 20 Apr 2016 21:32:34 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201604202132.u3KLWYMK096650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 20 Apr 2016 21:32:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298381 - head/usr.sbin/mpsutil X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2016 21:32:35 -0000 Author: bapt Date: Wed Apr 20 21:32:34 2016 New Revision: 298381 URL: https://svnweb.freebsd.org/changeset/base/298381 Log: Plug various resources leak While here fix a test logic Reported by: coverity CID: 1332096, 1332097, 1332098, 1332099, 1332100, 1332101, 1332102 MFC after: 1 week Modified: head/usr.sbin/mpsutil/mps_show.c Modified: head/usr.sbin/mpsutil/mps_show.c ============================================================================== --- head/usr.sbin/mpsutil/mps_show.c Wed Apr 20 21:30:56 2016 (r298380) +++ head/usr.sbin/mpsutil/mps_show.c Wed Apr 20 21:32:34 2016 (r298381) @@ -139,15 +139,19 @@ show_adapter(int ac, char **av) if (sas0 == NULL) { error = errno; warn("Error retrieving SAS IO Unit page %d", IOCStatus); + free(sas0); + close(fd); return (error); } sas1 = mps_read_extended_config_page(fd, MPI2_CONFIG_EXTPAGETYPE_SAS_IO_UNIT, MPI2_SASIOUNITPAGE1_PAGEVERSION, 1, 0, &IOCStatus); - if (sas0 == NULL) { + if (sas1 == NULL) { error = errno; warn("Error retrieving SAS IO Unit page %d", IOCStatus); + free(sas0); + close(fd); return (error); } printf("\n"); @@ -266,12 +270,14 @@ show_adapters(int ac, char **av) error = errno; warn("Failed to get controller info"); close(fd); + free(facts); return (error); } if (man0->Header.PageLength < sizeof(*man0) / 4) { warnx("Invalid controller info"); close(fd); free(man0); + free(facts); return (EINVAL); } printf("/dev/mp%s%d\t%16s %16s %08x\n", @@ -476,6 +482,7 @@ show_devices(int ac, char **av) break; error = errno; warn("Error retrieving device page"); + close(fd); return (error); } handle = device->DevHandle; @@ -515,6 +522,8 @@ show_devices(int ac, char **av) error = errno; warn("Error retrieving expander page 1: 0x%x", IOCStatus); + close(fd); + free(device); return (error); } speed = " "; @@ -579,6 +588,7 @@ show_enclosures(int ac, char **av) break; error = errno; warn("Error retrieving enclosure page"); + close(fd); return (error); } type = get_enc_type(enc->Flags, &issep); @@ -629,6 +639,7 @@ show_expanders(int ac, char **av) break; error = errno; warn("Error retrieving expander page 0"); + close(fd); return (error); } @@ -766,6 +777,7 @@ show_cfgpage(int ac, char **av) printf("Page 0x%x: %s %d, %s\n", page, pgname, num, pgattr); hexdump(data, len, NULL, HD_REVERSED | 4); free(data); + close(fd); return (0); }