From nobody Mon Sep 30 05:08:33 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 4XH8H54czjz5Xlwy; Mon, 30 Sep 2024 05:08:33 +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 4XH8H51mM5z4XZB; Mon, 30 Sep 2024 05:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672913; 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=X+MXnc8LBnL9fhFziy75DpoQ0yRbGVhQ/sZ3kLYukl0=; b=yYaqpc8vj0y59gVV5BxdCyfawZO2UaNJRhMg9tRHl9R+zmPMtpoPHsSjKNYkIEHIOE1HG/ VQH+a0l+zMQKrHtDBxGKmqeIZSj2ikZlqvOrRLKQmqhhd6UEYu42pF+3+RUTIASdOO1pfM o3jRdDyE7yAoDpPIGuGQCfI3RGfEL+nodbEwz0rJzQzZKMJ4krfwBKJZUFLGiIIs4T+oaq KdME2sEHJ6sl3VZ84rRcC+np3/r254aQ0cvoCqhbGTJAsc4hlzP+u19fgQjl6607AI18KY NAnQhek/Xp2dTpeYbb2+Q/QHgAH/kAEDqzZHBDd34dvGtZE+AYoCLNJ23C7fcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672913; 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=X+MXnc8LBnL9fhFziy75DpoQ0yRbGVhQ/sZ3kLYukl0=; b=A6JQ43LtvAZlb8xfA9Svs2/69AjU7mmm6YFOLB0jMLWYlG3tpCuYIWAthBMWkqPVkBgd6K a/S/cc+P7gdL9pUwXjI1fGm6DCP/nM/iRD+zvlSTgU+Z7L5MZoW0/kf9egy5KnVMo8oOls rb2XmqjKEAzHA7l6TrEVVMkpS9oro9QClsKP/0DKGidpHKc5gai6ta/YrqZFu3f9rfwvKj OmyNirGw+zPERFBdiSw0yf1tZ6Nyu7Y2gVZFN3+Kvp5tJR5A5r68BUQDX7uAtXbORHR+i/ L6ICiCfQ1FDCJ9X9pct56opeOWpbhu4SQ2WHJUgE04KnLGLB28NLr23dwHWylg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672913; a=rsa-sha256; cv=none; b=JxnDl6hTIScaHYDzxY26B0THnA7BDch72DpRcv6RoYiodfquJA1lHvRVScNz+dtyM53kPf Wlluoyn9LVidVZAg12259sOwRzj9SPnGdsJchJpzoST1CBam3In6/woow/uLHbYFKXrMZK ymoylqMsuSA44sN4kiV8361963Obm5M3n0Zok7+tktmVDO5X7EkndG/GFjiL8VFcMWvxP8 pvDTecC5l77xDHwd1D64o2m/hfI6jkeJMgkkRfY1RSnNk05WCI28CuTCExlYjmYqP+WtYY RchYqoF/izHpLetzkEDk76hHaDhw3F4Jq4gEbfNpfnKmb2VJookv5zlr3E5zNA== 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 4XH8H51LZ1zfqy; Mon, 30 Sep 2024 05:08:33 +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 48U58XGs025466; Mon, 30 Sep 2024 05:08:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58XTd025463; Mon, 30 Sep 2024 05:08:33 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:33 GMT Message-Id: <202409300508.48U58XTd025463@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: 6f7d5f52c19b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 6f7d5f52c19bad9e260425b6f5c3cde7a83cadd1 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6f7d5f52c19bad9e260425b6f5c3cde7a83cadd1 commit 6f7d5f52c19bad9e260425b6f5c3cde7a83cadd1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:31 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:38 +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) (cherry picked from commit cf44738feb83b03f0726ae1dab83daf371aa2f0a) --- 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 e3590df73283..b074be4c98e8 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -2077,8 +2077,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; }