From nobody Mon Sep 30 04:45:44 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 4XH7mm5QdZz5XkSY; Mon, 30 Sep 2024 04:45:44 +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 4XH7mm3W44z4FrV; Mon, 30 Sep 2024 04:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671544; 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=zqKJvQPfg5EckMCCNO/5+g7ELeLYWLZmwFp5shGyKVg=; b=x90Cir03/dl5+v4Le7kl3ef7zJlZii6IAOH1emlaMy9pDen5U3FH9N/8wfemDqvatNIsnG peFsWx7U0L3uiCjMBhCV8seGQlvnFuare+jO5HcyrGEDiYCCnar6S+WHbPOs7d9dZ/+hYb kgy2cJ7K1x9rtUXROcQUwUcigBa4YgxuTjG5ZKSqwFQl6LKnn156psvVH0x6U+2+uX+kfq m4nni6Z6TF8oPZuNNnvHedT1e3HlW+AZ/dntrW/B9zjWOoDkyN7cfBWWDPD2OKn/O+q1uw kB2GSPBiXoEjqcMtbqVv+rhWNgYKUMKjExPm5+zmWyPkF4Kfszd/XX0NPKoTfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671544; 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=zqKJvQPfg5EckMCCNO/5+g7ELeLYWLZmwFp5shGyKVg=; b=EavbMhUrtvhXS7nzzp1RpMzc2omcvnVgkdae6swhOGW9ZnjR2FJE4bogSiSVjzEQrYzdmZ 02pPnxzrxp6BCnwTwqCLEhKq/6ekmt7BzZMXNXASy91X7pkstplZyYBAZ+vbCRb1E3ZiUO c1z+kmjOZN1pwKyEF9EoS4odZshJrIyXkC/EFpDFf/4+d8c1HjoBf8Er1TeGqLcqelON0L y6RCnKiTr8kIv4nOG5nud9QMS50rk8ikD3JOPTGlIrJeWSbM5UQK4t1hOELQrJ0cgYQnHn fSBYCvvzTScGwSSKYE+MA9+WlJl+iXfIIxRK/S5oIE9cqB4naErQxdYBsxUktg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671544; a=rsa-sha256; cv=none; b=GVINs9dyRY36ig0MINfGiZ0ERSQaoRwAZVPJ6l9tADsoe/Y0h6vT6Q/dgbEGE1ulVfI0qJ MBSu2UKLulEZgKsKvGSgGRUOtuJecsjXlI3c7OMqWBlF15HUwvplvCF1StYtQ0V4SvUyHg 7k0sO8I0S01+e31c2x7wrNv0ZGz26xdxA6BQ4ZYcR+w951cCy+6CTxZyaFzx4OZ83hSwdJ f+vjgB49t2w6ftWq1FS3EOMfYdgn/TacsTI1MeA29XX8TAi0U5ZJ89khQyLJzVJBgymIvx ui1/CQkAwqbh2vifyNbzpKpSgZ/npQpkJ0FGiu6KmhATeWL7Z+N6yWBmlXK7wA== 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 4XH7mm2d9Qzf9W; Mon, 30 Sep 2024 04:45:44 +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 48U4jiCP087795; Mon, 30 Sep 2024 04:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jilf087792; Mon, 30 Sep 2024 04:45:44 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:44 GMT Message-Id: <202409300445.48U4jilf087792@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: cf44738feb83 - stable/14 - mlx(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: cf44738feb83b03f0726ae1dab83daf371aa2f0a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cf44738feb83b03f0726ae1dab83daf371aa2f0a commit cf44738feb83b03f0726ae1dab83daf371aa2f0a Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:31 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:24 +0000 mlx(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 556cd18fb07604e3442819b221afb2a19b924dbd) --- sys/dev/mlx/mlx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index bed697b0423c..63a31652682b 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -2075,8 +2075,8 @@ mlx_user_command(struct mlx_softc *sc, struct mlx_usercommand *mu) goto out; } MLX_IO_UNLOCK(sc); - if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK)) == NULL) || - (error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) { + kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK); + if ((error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) { MLX_IO_LOCK(sc); goto out; }