From nobody Wed Feb 19 16:24:58 2025 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 4YyhZ26kNpz5pZ02; Wed, 19 Feb 2025 16:24:58 +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 4YyhZ25n8nz3ZdP; Wed, 19 Feb 2025 16:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739982298; 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=JwgfrCT47tdii0qgFCzEbo+JaRbI8PPfpbMy+91mvHA=; b=Y7+ryxXvrA3Wj3L7f97+D4lclEp+cSaiDIP9QW2ASTy1MS+Vm6s9zYQOBPfuOweG06TKr5 GOJrsDM1YGwSTKCH98c491TfMjJF3YDjhEqMIdZuwUKCOkp3Y7AT+oboNRv5Nt64u2062J 6kaxwIkOK7F0OGrEF4dv3qjXgVhTQhZkgh0sUWn7VflSe9sb6Grak8Le2MZixGbjfN9oMY DHpFGCqMNpxDeb45AH1H5/fvs2e26tiTp+drr28EbnCkwrJLoSqJxFhX8Pho9A8prsgRvH OOKt+quefz6n90DXeGUpzLph/w5nJ96vasKdNJQGs1NJ+rMYVTJlGGPKS20NrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739982298; a=rsa-sha256; cv=none; b=ONH9twctVdS9/j/MesQZztXmG19+OBqjhmfEv7v8z6VvASornYQOiyRdbvMwGWsjaWRt6m c3IxgHjQIm2/QVxhRijh+nH5LWPZYA8ULOqaZj7XDlRtvJOQJRYNlH9dRd9KI2P1O5YC6F DPoaz/gfMlHomyOjbYtXFFlcdq7XtD2f6lxNwEtd+4tU5UN72/JZ/3uBIzj3E6iBxvVgCe DrPk3vkBt21o9un00hWc3XLEYxyCx+dMULpNTLe/+GQimcrhju2v6VosG+eA0EQnvM/PNO ATzfS4k2tqYH/Higp4ODMtdH648O+NwxemqlnH2oDxjr1CuWZ9Zrl5zSippf3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739982298; 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=JwgfrCT47tdii0qgFCzEbo+JaRbI8PPfpbMy+91mvHA=; b=R+ZKqwAzgbuevYWXyVE0VrIe0A1fVhyAi7NMiTdZO1UyxTI9evzUeVeu8IAYED5cysdkWo mCxj8uBCpzUJh0DlMfcbBCy7+PxJ1+IxqpSpnFx6Yyro03mZoGLr4ID16ceSlmRHPW2bg3 +fCUe38uZS++x50EpCeGlHVy8o6cymIhmK2ByPWrO0//S33dpQG2k8S2MgK8qL4e5Sx3aa z7YvnrJFqa3q/ImOc1wdcbNVy9tHsxOuRX5RnOPRHLkAwqJo4e6yirBLyV9ja2sOJTVAXz adLZ7/qz+PnSxwllZ/E+mqs5yb8XCWFjWS7W0w3v2wwv+XqN3Yg7V1WYXZw1rw== 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 4YyhZ25LqGz1CXN; Wed, 19 Feb 2025 16:24:58 +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 51JGOww8083703; Wed, 19 Feb 2025 16:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JGOwwj083700; Wed, 19 Feb 2025 16:24:58 GMT (envelope-from git) Date: Wed, 19 Feb 2025 16:24:58 GMT Message-Id: <202502191624.51JGOwwj083700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 9fcb7c640e27 - stable/14 - uath: Avoid a NULL dereference 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9fcb7c640e27088b2b6673f5cc26cbf230d0a28f Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9fcb7c640e27088b2b6673f5cc26cbf230d0a28f commit 9fcb7c640e27088b2b6673f5cc26cbf230d0a28f Author: Jose Luis Duran AuthorDate: 2025-02-12 15:31:43 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-19 16:24:39 +0000 uath: Avoid a NULL dereference PR: 284643 Reviewed by: adrian Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48948 (cherry picked from commit 4b77a9a80cf8a9cba5607d8d8fa0742334dcf0f4) --- sys/dev/usb/wlan/if_uath.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index e78003bc250a..26a1b2c74baf 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -2303,10 +2303,12 @@ uath_cmdeof(struct uath_softc *sc, struct uath_cmd *cmd) __func__, dlen, sizeof(uint32_t)); return; } - /* XXX have submitter do this */ - /* copy answer into caller's supplied buffer */ - bcopy(hdr+1, cmd->odata, sizeof(uint32_t)); - cmd->olen = sizeof(uint32_t); + if (cmd->odata != NULL) { + /* XXX have submitter do this */ + /* copy answer into caller's supplied buffer */ + bcopy(hdr+1, cmd->odata, sizeof(uint32_t)); + cmd->olen = sizeof(uint32_t); + } wakeup_one(cmd); /* wake up caller */ break;