From nobody Wed Feb 12 15:34:22 2025 X-Original-To: dev-commits-src-all@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 4YtMmt5sXqz5myDd; Wed, 12 Feb 2025 15:34:22 +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 4YtMmt3SHlz49wF; Wed, 12 Feb 2025 15:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739374462; 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=3TBfAztdopyaWABupkTkTgXAWVsLje+mhmzEaWRo44k=; b=Agr7LXfKd7Rfj8kU77mDZqRQPDK8YxbSr9gpF25KjHHmDRW+PNyBftXuIRdacbu0xujFzT 4XZsLYQd+IahOis6O4ViJI3CqN5HJ9rMqBQDzjETdNHAxp1sPbWFWoC1wytDVApRLrFIOC JqHitDHmbhrht0qaa7JX1q13NVVkj8wG5ZtCjoOAK3e4a8cayrp1PF6/aS619qcq/Tru+/ +gHg8J7mhA6c6exjQ3pRNdBmm7rUgVrpzRcJ3iuCtN9la+YG7+B8axBu6HLHDO+4XXxEgK Ehz7DClTFDdDulFVvFA+chKd3n5tjQyN2nIN0kNrLZ+KSblU1k3Ir5r7lpbSzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739374462; 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=3TBfAztdopyaWABupkTkTgXAWVsLje+mhmzEaWRo44k=; b=gvQmcXyg8ujncMu5TX6UN6OCOqgOULr+osOmFtLIE7b+AjcRIfQ8WdeYNdq9BTW6xz6dYb EftWmNcXk8ZF9gyBoDt6JTkJyfjKAZGkIngMK22Hy6C5aS5oB2CR7yDnslAZYNA5gddfBd u18XN2y9JHZIDh7BfLh4uecxxaS8gtNLaK1lLA46fZVDm3G9FBz5YjGXg6Ko2zp/ihBUcD 77QAMDT2bL/g8qQpAN0JBZAsfWf3gGtVyz/q6yMjAhu7hWw45SMfHNh5qeqhT3PKijwv4M hVcWmSiX8pPmWjYJkFKL47jKrvN8vNB+ebATxVlyXxk0cCjMEuIQIQen+aLOyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739374462; a=rsa-sha256; cv=none; b=apAyT+fHra3c2adFWJQPa1Ec5CdSM6YeDj7/J1KrkDicanN4z3Pnp6DMheZvFM3FYKa96i CdOUgdlX9J3gIMe0DrMoxuzstP5v3GRoIsGqP+5PHUv+MhGqcTH1oVTOEFvxKnYsAIFMIG G0WL+EXAGbWnFPbx7g/b70VfOD4IQmG6YBnUyjB8KDCb88OnnZHp1djEj7zHAckpuD56MX S03TZX7u9VuPR4Yc3qBLuYXjNMsUeJXApmpSt56ltgaTOAOmfeIy7peIC1CuS6TsTstsx2 CQJdqeRbWtp0s3reqFJuZJoG4T7R3xJxy6o2dJLQdsI0ZX0/yb7vV8l8XmzQJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YtMmt2rSQz14Zx; Wed, 12 Feb 2025 15:34:22 +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 51CFYM4H010532; Wed, 12 Feb 2025 15:34:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CFYMaf010529; Wed, 12 Feb 2025 15:34:22 GMT (envelope-from git) Date: Wed, 12 Feb 2025 15:34:22 GMT Message-Id: <202502121534.51CFYMaf010529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 4b77a9a80cf8 - main - uath: Avoid a NULL dereference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4b77a9a80cf8a9cba5607d8d8fa0742334dcf0f4 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=4b77a9a80cf8a9cba5607d8d8fa0742334dcf0f4 commit 4b77a9a80cf8a9cba5607d8d8fa0742334dcf0f4 Author: Jose Luis Duran AuthorDate: 2025-02-12 15:31:43 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 15:33:26 +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 --- 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 32e3c0325c6e..10e3b50eaeb3 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -2308,10 +2308,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;