From nobody Mon Sep 30 04:45:38 2024 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 4XH7mg1l4Jz5XkMb; Mon, 30 Sep 2024 04:45:39 +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 4XH7mf65Lvz4FZh; Mon, 30 Sep 2024 04:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671538; 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=02eJ/Alv4sKOwzwQspzc8uIAb4wtBzFJ0uy7QT/20mM=; b=q1yLo344Kz6YzaL9sJtkRvs2t3Aeryg1yNxBRAKW4IHDI47tokCFbdyn+5jfVYOowdeEeb oDu/8MKJGCT74fBkeqkA6wnbeWabiBj+VOMNEd9zPdK0XwxrDm1AWp2jmraLgCbYtDYleD y0GM3ILtwwza/QBYUmlq7LfJCryEY7Dw8SvKSOepnWUyVi2IV1/1OrbYEZY2ThcrBuj6FQ chCoA0n4IlmHvXCvbTp6h5zD8oP65ur7eMM20fGBx3bMqk0lSFZsXMEjFEH+RkaouPAwWN qUKasrVbWnJ1SWpTsPO7gMSBCuGehXzLuwP1DVHhAVAIRHc/KbFj3OWoOjcFlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671538; 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=02eJ/Alv4sKOwzwQspzc8uIAb4wtBzFJ0uy7QT/20mM=; b=MvgdmOiYpT1au+RXl9q755QESDlZCl3v3p5ef3ytN+GJuFNrmO8UYfVPbpAkPT4tBdHSyd gBFzYLW0qbuP0vz+Ec3+ZCmt0HrX1+Vquw2YzTQqjO+iv4ezryNVddp0Z4hXDHq0otfL7H XhwnobiP1wJQJUKu2fvrrK2LBTIjTkgH5wY4a5/nHlhTOLfG8xwz9HiNOc5qkZMU1wgQNo Jod/pNnrfh6mcZ3LL5NBOxkIp6qVnAreE3bASoPPWO5ElwnO0XusJ8USZ6i4KFqASE0Dtj L6VT/XaYBkz3u6QQ4dF2ANxum6Xyw/ivwHlrGbJ+aZ6MNigXVbXQVvsRGx7K5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671538; a=rsa-sha256; cv=none; b=E3lNCC3f1ryiMYnOD945gmZQaLCsgzJpj2ZIrHPAd0GgLGr2fPwpwOvaKveVmP74fJO108 ow2eWKi1ha5wQNbbploPXscB3DfGzHGPQKvyAGjoLcj191vxhDvvB98fSHe6/hC3Pa12tg HWwQDx8dOs93zP/3AtbJKillTtXawOKl8vIPTnvq6gJEjnaSO0zIJACXCorpn3ZEMBrX8Y 9hTK0mNXPylv9+qOgwbUzhLUxk71Q6LSUHwP0WZwBDADkH2j8Oz0WhgyyzukfcImNZQj4g hEG4EbQqk7zN3m2QVfGE1U85IQ8zC7MohHZr4LGFyp6uMSHF/STSIQUvwlaITg== 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 4XH7mf5G8nzfFv; Mon, 30 Sep 2024 04:45:38 +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 48U4jc6e087535; Mon, 30 Sep 2024 04:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jccH087532; Mon, 30 Sep 2024 04:45:38 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:38 GMT Message-Id: <202409300445.48U4jccH087532@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: e4de0a965faa - stable/14 - hptrr(4): Stop checking for failures from malloc(M_WAITOK) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: e4de0a965faaff171e6061714478c8f4eaec8cb1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e4de0a965faaff171e6061714478c8f4eaec8cb1 commit e4de0a965faaff171e6061714478c8f4eaec8cb1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:23 +0000 hptrr(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 92b0370ec65d5287a1deec84fd513e320a8da736) --- sys/dev/hptrr/hptrr_osm_bsd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c index 4208dd620e37..055ad13b14cb 100644 --- a/sys/dev/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/hptrr/hptrr_osm_bsd.c @@ -1032,10 +1032,6 @@ static void hpt_final_init(void *dummy) for (i=0; ivbus_ext = vbus_ext; ext->next = vbus_ext->cmdext_list; vbus_ext->cmdext_list = ext; @@ -1252,19 +1248,14 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru if (ioctl_args.nInBufferSize) { ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK); - if (!ioctl_args.lpInBuffer) - goto invalid; if (copyin((void*)piop->lpInBuffer, ioctl_args.lpInBuffer, piop->nInBufferSize)) goto invalid; } - if (ioctl_args.nOutBufferSize) { + if (ioctl_args.nOutBufferSize) ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO); - if (!ioctl_args.lpOutBuffer) - goto invalid; - } - + hpt_do_ioctl(&ioctl_args); if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {