Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Sep 2024 04:45:44 GMT
From:      Zhenlei Huang <zlei@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: cf44738feb83 - stable/14 - mlx(4): Stop checking for failures from malloc(M_WAITOK)
Message-ID:  <202409300445.48U4jilf087792@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=cf44738feb83b03f0726ae1dab83daf371aa2f0a

commit cf44738feb83b03f0726ae1dab83daf371aa2f0a
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:31 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
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;
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409300445.48U4jilf087792>