From nobody Mon Sep 30 04:45:04 2024 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 4XH7m03pzfz5Xk0V; Mon, 30 Sep 2024 04:45:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m03HQcz4DRq; Mon, 30 Sep 2024 04:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671504; 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=8AMOee11tFqrnYmQZV8PQ+Gj4PQILUVeqid+1XAwG+E=; b=IcCSwWM3pyitazZdAjQAhnYNT6/48jk4m80Ucqd0QaEoHoU5tYzBpD9VutpT75UwAKYkOP XwqmqB3QXhOMXH+9Aw7JYuV5uaDAoynp5F9KJ/960yARHY4+M1iM6jkciAGse0iLI2eVfb nRuOACExYO3tQYs8LXOHk2D8Wk5THCsZRdTYOBcCPV6sQlwNY5N6fjvOLghG3Ux8H73tzE 4ePJkNrmEv8NS/IPayi9Y34OaC/8VP/qqPKu1/ynFVd6E4yv/8l+rmfBhZ29+hkZHFpOn0 dERQ3O9XOkFr1D7ffgL0q+3bVZrhzKu0C53vsr/bSbBcbmTRTNnD5fyB5Y1b1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671504; 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=8AMOee11tFqrnYmQZV8PQ+Gj4PQILUVeqid+1XAwG+E=; b=GnteQmDCKcwHkuQXgJo980EdmC3bw1m3nxAnmWFMSHE3Kfs47TmtB+r67b7Y5geKfAo5XO 0DINmnpuWSRa2R0D0P8JdZ6/SBaFdXdyhP+in+YpkcdYIlytAg0sJYT8LEVfnCexSJXM0B gKEzMitpY+qkoxqPeaFJeIoVSvW8TAvtXieWV+iypl8fb/IMPCuw9SPgBBkUJ2fleKUM8J WXYh7UQAgNRDabhubFBZa7x8p9y+OYJCo9yyMsiE9iYsw5WK14YtnBdcNHZ2Hv/siq5M4d 7hnlWtTpGyTZTcv9z+6oQWdl9aguQwDp6ai8tgbhS68pzigCgvMQJmKE5udQXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671504; a=rsa-sha256; cv=none; b=DPZLsI4WhjoVluE4pXAUQ8YPGkNU16BVyj7/YBe5slc3Sa/UdIsSmzMSTODR4AMozrUulw id4FqrAZFuSi+Gs+aCHQvuzPe722C798zKVrfXWldoVH41FmwQF7heSKvRqsWfQzXo5MbX XczELcpL3XYfUKkf0aXoPfAGONeLKAd+f5qpnii0lsjtPqmLsYkoJKLICR3O8Kf0zNL0cb 34MnKVhQfeibFZSqKepMTdUFN/8kKoQetp0iM5Nk3FOAn547ykasBbiPnqrtzQKk9DZXtc 12A8QJD+TdIJtmIsfRfTBLW8LqQXByrCy0/GADmA8yaYCMub2XSIGdNyS6U6AA== 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 4XH7m02qqdzfbg; Mon, 30 Sep 2024 04:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4j4Oe086004; Mon, 30 Sep 2024 04:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4j48i086001; Mon, 30 Sep 2024 04:45:04 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:04 GMT Message-Id: <202409300445.48U4j48i086001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fbaf48065115 - stable/14 - kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c commit fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:16 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:13 +0000 kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) `fp_malloc` is defined as a macro that redirects to `malloc`. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6a2a385507c79abaa9db9eabfdd827362f3dc7ed) --- sys/kern/kern_fail.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c index f60500b22ef4..2c362b68f24b 100644 --- a/sys/kern/kern_fail.c +++ b/sys/kern/kern_fail.c @@ -479,11 +479,10 @@ fail_point_init(struct fail_point *fp, const char *fmt, ...) /* Allocate the name and fill it in. */ name = fp_malloc(n + 1, M_WAITOK); - if (name != NULL) { - va_start(ap, fmt); - vsnprintf(name, n + 1, fmt, ap); - va_end(ap); - } + va_start(ap, fmt); + vsnprintf(name, n + 1, fmt, ap); + va_end(ap); + fp->fp_name = name; fp->fp_location = ""; fp->fp_flags |= FAIL_POINT_DYNAMIC_NAME;