From owner-svn-src-head@freebsd.org Thu Sep 21 15:30:22 2017 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 19975E0B37A; Thu, 21 Sep 2017 15:30:22 +0000 (UTC) (envelope-from tsoome@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 DCE89828B8; Thu, 21 Sep 2017 15:30:21 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8LFULJX002167; Thu, 21 Sep 2017 15:30:21 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8LFULoR002166; Thu, 21 Sep 2017 15:30:21 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201709211530.v8LFULoR002166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Thu, 21 Sep 2017 15:30:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323867 - head/sys/boot/efi/libefi X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sys/boot/efi/libefi X-SVN-Commit-Revision: 323867 X-SVN-Commit-Repository: base 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.23 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: Thu, 21 Sep 2017 15:30:22 -0000 Author: tsoome Date: Thu Sep 21 15:30:20 2017 New Revision: 323867 URL: https://svnweb.freebsd.org/changeset/base/323867 Log: libefi: devicename.c cleanups Remove duplicated free()+return statements, default unit to 0 and improve strtol error processing. Modified: head/sys/boot/efi/libefi/devicename.c Modified: head/sys/boot/efi/libefi/devicename.c ============================================================================== --- head/sys/boot/efi/libefi/devicename.c Thu Sep 21 14:41:41 2017 (r323866) +++ head/sys/boot/efi/libefi/devicename.c Thu Sep 21 15:30:20 2017 (r323867) @@ -87,9 +87,9 @@ efi_parsedev(struct devdesc **dev, const char *devspec { struct devdesc *idev; struct devsw *dv; + int i, unit, err; char *cp; const char *np; - int i, err; /* minimum length check */ if (strlen(devspec) < 2) @@ -105,6 +105,7 @@ efi_parsedev(struct devdesc **dev, const char *devspec return (ENOENT); np = devspec + strlen(dv->dv_name); + idev = NULL; err = 0; switch (dv->dv_type) { @@ -117,10 +118,8 @@ efi_parsedev(struct devdesc **dev, const char *devspec return (ENOMEM); err = disk_parsedev((struct disk_devdesc *)idev, np, path); - if (err != 0) { - free(idev); - return (err); - } + if (err != 0) + goto fail; break; #ifdef EFI_ZFS_BOOT @@ -130,10 +129,8 @@ efi_parsedev(struct devdesc **dev, const char *devspec return (ENOMEM); err = zfs_parsedev((struct zfs_devdesc*)idev, np, path); - if (err != 0) { - free(idev); - return (err); - } + if (err != 0) + goto fail; break; #endif default: @@ -141,20 +138,23 @@ efi_parsedev(struct devdesc **dev, const char *devspec if (idev == NULL) return (ENOMEM); - idev->d_unit = -1; + unit = 0; cp = (char *)np; + if (*np != '\0' && *np != ':') { - idev->d_unit = strtol(np, &cp, 0); - if (cp == np) { - free(idev); - return (EUNIT); + errno = 0; + unit = strtol(np, &cp, 0); + if (errno != 0 || cp == np) { + err = EUNIT; + goto fail; } } if (*cp != '\0' && *cp != ':') { - free(idev); - return (EINVAL); + err = EINVAL; + goto fail; } + idev->d_unit = unit; if (path != NULL) *path = (*cp == 0) ? cp : cp + 1; break; @@ -168,6 +168,10 @@ efi_parsedev(struct devdesc **dev, const char *devspec else free(idev); return (0); + +fail: + free(idev); + return (err); } char *