From nobody Fri Oct 8 01:16:22 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BDE3112D09AF; Fri, 8 Oct 2021 01:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HQVdL4FZqz3tXl; Fri, 8 Oct 2021 01:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 679561DCD9; Fri, 8 Oct 2021 01:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1981GMGu010471; Fri, 8 Oct 2021 01:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1981GMmJ010470; Fri, 8 Oct 2021 01:16:22 GMT (envelope-from git) Date: Fri, 8 Oct 2021 01:16:22 GMT Message-Id: <202110080116.1981GMmJ010470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 16608adccae5 - stable/12 - loader: should check malloc in zfs_dev_open List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 16608adccae5bac11367c71a964d374631ef6a5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=16608adccae5bac11367c71a964d374631ef6a5f commit 16608adccae5bac11367c71a964d374631ef6a5f Author: Toomas Soome AuthorDate: 2019-11-03 13:03:47 +0000 Commit: Kyle Evans CommitDate: 2021-10-08 01:15:58 +0000 loader: should check malloc in zfs_dev_open malloc can return NULL. (cherry picked from commit f4ed0045735d88aa681b4933072ff35a890a86a0) --- stand/libsa/zfs/zfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index 3393bcc45052..9386dd7b3729 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -683,6 +683,8 @@ zfs_dev_open(struct open_file *f, ...) if (!spa) return (ENXIO); mount = malloc(sizeof(*mount)); + if (mount == NULL) + return (ENOMEM); rv = zfs_mount(spa, dev->root_guid, mount); if (rv != 0) { free(mount);