From nobody Wed Mar 22 22:28:29 2023 X-Original-To: dev-commits-src-all@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 4PhjmY6Q30z41P6K; Wed, 22 Mar 2023 22:28:29 +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 4PhjmY5P5sz3hWc; Wed, 22 Mar 2023 22:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZrXsWKGE5Vhv+ZMY5MMUMTRknssctaW/hd8id9R4/w=; b=SdL8vFgcZwu9TxwNecTI9hCVjDXT+c6Im7cQNDb8wAvoAV8DTuwb9i2heC66IRhZ3RCY2W l2FtXd6XjvACeonm8PqLomnv6sN69M8fK/gUY3xf/jYTtsR5utGGgsx1ZaOrAbcmvmRI7x n9psInfFdVf+h57VXH4HWKMRp4yIlLUq7s/UkFtBvBpHMKVdpml+j1KBCGFak0yl/sP/D1 6AgrEfpIFOJXN1qoyGV3saU+e80dGGG3eiv+QakhZuZbOigphkvw48tjkJeQqtc5qZCJAe z/1LIuvBHQ49hOL8MXS0DpkOeZcyiRQ4DPlk//G6McJSoA/5tya0iDzOS+SOTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZrXsWKGE5Vhv+ZMY5MMUMTRknssctaW/hd8id9R4/w=; b=EiUF2/zcD3gALOKiaLHpM/+wrOCvu61uW3JS5Gbbk6LhcdsXCeReX1sp/sXj7uswYlbRj8 5rj/Eq0MhupTkuucRw5CNUjwt8uH9ZixTniVt4ozv1iMDm+Dunm6C3KZ0Ii3T6XY0URRPR EOtHbp0OvqgNDswhFMxz5eixms+q1gSQkJj6HDNr0ebQ4DIVh7rqu+fxhn9CsakVADgiMF AaTBzWLgQKlOWwbb2Q/yB7bcaEBA1KKhZFt2j0fLYSyM91Znc5gQFi38z7PrpH3lXCRpxM luBIUqqBF5SMyqeH3wTIW1V1Ck47fsKzJxYwkXGQCyyKovP6e5TgjFmnpHS8rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524109; a=rsa-sha256; cv=none; b=Gi9o2xAfBspRbmrW9VOp8Czx/iMqKcvPgV/Xbh4Uiqc5c/a9ISFzylpgxJUoYpZKvZBLII 1IED6bqMg3tjZFEK1POrpAoIaSXVp3TWovDR9OAsPsapjZj3Uf7CBvOHeEtqRkjvsiUbaX EuG10ryuWasqmyg6FrxHjV8YM267s5H1qXgPlwRHtWiSkeS+0xvpnzpT3tRG3TxDP2R1sC SePONaYN+aRyQsGLRqZm9agMewF2BntQIBh46G6xLGgaxfik3FOqsQMSVE/X3QEUcG7zZL jd3BVoNL2ylBJcWy8Mqlo9MLOP1SfkRjDs4adm9Uw0pvZo0/BBFY2j1sRwEQCA== 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 4PhjmY4V40z1BM5; Wed, 22 Mar 2023 22:28:29 +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 32MMSTE3001655; Wed, 22 Mar 2023 22:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSTMm001654; Wed, 22 Mar 2023 22:28:29 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:29 GMT Message-Id: <202303222228.32MMSTMm001654@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0ae8e682d806 - stable/12 - dtrace: avoid gcc9 Walloca-larger-than List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0ae8e682d8063a1cb16bf2de18a10681d3c17411 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ae8e682d8063a1cb16bf2de18a10681d3c17411 commit 0ae8e682d8063a1cb16bf2de18a10681d3c17411 Author: Ryan Libby AuthorDate: 2019-12-21 02:44:13 +0000 Commit: John Baldwin CommitDate: 2023-03-22 02:18:22 +0000 dtrace: avoid gcc9 Walloca-larger-than gcc9 grew a new warning for unbounded allocas, such as the one in dt_options_load. Remove both uses of alloca in dt_options.c. Reviewed by: markj Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D22880 (cherry picked from commit fa19b250bdb7e463b58a8e7628ebea09a44197f3) --- .../opensolaris/lib/libdtrace/common/dt_options.c | 68 +++++++++++++++------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c index c99e6007f9da..ce13659f1685 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c @@ -38,9 +38,6 @@ #include #include #include -#ifdef illumos -#include -#endif #include #include @@ -162,26 +159,40 @@ dt_opt_cpp_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) static int dt_opt_cpp_opts(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) { - char *buf; + char *buf = NULL; size_t len; const char *opt = (const char *)option; + int ret; - if (opt == NULL || arg == NULL) - return (dt_set_errno(dtp, EDT_BADOPTVAL)); + if (opt == NULL || arg == NULL) { + ret = dt_set_errno(dtp, EDT_BADOPTVAL); + goto out; + } - if (dtp->dt_pcb != NULL) - return (dt_set_errno(dtp, EDT_BADOPTCTX)); + if (dtp->dt_pcb != NULL) { + ret = dt_set_errno(dtp, EDT_BADOPTCTX); + goto out; + } len = strlen(opt) + strlen(arg) + 1; - buf = alloca(len); + if ((buf = dt_alloc(dtp, len)) == NULL) { + ret = dt_set_errno(dtp, EDT_NOMEM); + goto out; + } (void) strcpy(buf, opt); (void) strcat(buf, arg); - if (dt_cpp_add_arg(dtp, buf) == NULL) - return (dt_set_errno(dtp, EDT_NOMEM)); + if (dt_cpp_add_arg(dtp, buf) == NULL) { + ret = dt_set_errno(dtp, EDT_NOMEM); + goto out; + } - return (0); + ret = 0; +out: + if (buf != NULL) + dt_free(dtp, buf); + return (ret); } /*ARGSUSED*/ @@ -885,27 +896,35 @@ dt_options_load(dtrace_hdl_t *dtp) dof_hdr_t hdr, *dof; dof_sec_t *sec; size_t offs; - int i; + int i, ret; /* * To load the option values, we need to ask the kernel to provide its * DOF, which we'll sift through to look for OPTDESC sections. */ + dof = &hdr; bzero(&hdr, sizeof (dof_hdr_t)); hdr.dofh_loadsz = sizeof (dof_hdr_t); #ifdef illumos - if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &hdr) == -1) + if (dt_ioctl(dtp, DTRACEIOC_DOFGET, dof) == -1) #else - dof = &hdr; if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &dof) == -1) #endif - return (dt_set_errno(dtp, errno)); + { + ret = dt_set_errno(dtp, errno); + goto out; + } - if (hdr.dofh_loadsz < sizeof (dof_hdr_t)) - return (dt_set_errno(dtp, EINVAL)); + if (hdr.dofh_loadsz < sizeof (dof_hdr_t)) { + ret = dt_set_errno(dtp, EINVAL); + goto out; + } - dof = alloca(hdr.dofh_loadsz); + if ((dof = dt_alloc(dtp, hdr.dofh_loadsz)) == NULL) { + ret = dt_set_errno(dtp, EDT_NOMEM); + goto out; + } bzero(dof, sizeof (dof_hdr_t)); dof->dofh_loadsz = hdr.dofh_loadsz; @@ -917,7 +936,10 @@ dt_options_load(dtrace_hdl_t *dtp) #else if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &dof) == -1) #endif - return (dt_set_errno(dtp, errno)); + { + ret = dt_set_errno(dtp, errno); + goto out; + } for (i = 0; i < dof->dofh_secnum; i++) { sec = (dof_sec_t *)(uintptr_t)((uintptr_t)dof + @@ -942,7 +964,11 @@ dt_options_load(dtrace_hdl_t *dtp) dtp->dt_options[opt->dofo_option] = opt->dofo_value; } - return (0); + ret = 0; +out: + if (dof != NULL && dof != &hdr) + dt_free(dtp, dof); + return (ret); } typedef struct dt_option {