From nobody Fri May 13 17:58:49 2022 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 ED1CA1AE9425; Fri, 13 May 2022 17:58:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0Gbs3KVvz4X7P; Fri, 13 May 2022 17:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464729; 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=UweJNDOqHlyRzVJjMgbSqAQ/l68KXhyH3xxuj44f0oY=; b=weV717oYVFj7h/vcaJuaYVkcKVq0dUqrU1dlhE7PX+W0JRkKboB3P19SPk+ow8aOso4XWW CjTMWcjxJGmdrAUMV4HKKy21hWYzH2HeniRQdN69o0ta1wa1vxxUVVg02nFHPssOzTXThr JvNSh71rUGRqPJ9/z3dwr0XPmvSlFnCmqdvPM9IrhzCJx3WJN3Dd8SRMH5lA1DBGf00SlF ETYJ3gKWfIZ+JGYU1uCRtjTZyj9jTQueHOvG+zSV2U1QbMCLXNJDL/5zPR8iZB6kywOupo NYHfXLf8Am8TweMo/95ou7IKekE+WBLsOrel9dt1MVcTUcoebiukeoklxkNr6g== 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 5184626FDB; Fri, 13 May 2022 17:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DHwnZ6069569; Fri, 13 May 2022 17:58:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DHwnAo069568; Fri, 13 May 2022 17:58:49 GMT (envelope-from git) Date: Fri, 13 May 2022 17:58:49 GMT Message-Id: <202205131758.24DHwnAo069568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fabc2ac3add8 - stable/13 - bcm2835_audio_callback: Don't process garbage if there is no message. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fabc2ac3add8f505e29483f40127813edfcb141a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464729; 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=UweJNDOqHlyRzVJjMgbSqAQ/l68KXhyH3xxuj44f0oY=; b=PSfVqBjIh/aMDOE7GBZrn2fxd+Z8Ult5DczH/0hQDlwL+NaJF06gA5m0dXO7vNr1HZsNIE H8sLiIJchjL4fMjSv/i3kjHLgIpzK8iJQmtLpSLYM/9na5DxkEhHvZEwxDFQx8HgkQ+YOo KUwqCpQAafJlAegxdzl1xTyv6PUkbGkedGxNgqvJ+mWGwvY8PYJp9zSUl0iP8B2mW+QNO2 Vw/8S5N49bKbtYOONgUgXZEKEevEVI1yix/yn1LxV5+qQ1dAJLVJyG2tl4sjq5MTNLYI4l 9ROF1BRw/4znFiNy/5p5g3MJKAXVDeDNJHWtNfFV5z1BMw/B6I7ixiJqcHZMAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652464729; a=rsa-sha256; cv=none; b=paQcOBF0kmggtUP9ulDeplMRG2gFAsIboaeAkaA8MPLz77yjQq03D90tVNEyi3I/jlgM+A wOsnRqx0O4tzdsdlIY7/weYLgAaaHdOgdD1MbPqIp5NnTSRTmtOVUV6srYJSYiE/8nYGPr iJ3nC9Nz0ZIgP6mLBfohYaE32dFtHNTn1XLiItOjAFSSd99Ub+XTpX+2rwy4jcvSqQqF8H Q4SurI1GqQB3ATjheUC1FyOsVJ6iWap2yeO569nL/8rjZ5yHR7PUrAnmvO8UzDWdqe1N2b D53ACJxuTY1ZN9B7XcRUD/O11ZIcA6jzC0hJhVgl3b9UbHKODwkERfZ6soyatg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fabc2ac3add8f505e29483f40127813edfcb141a commit fabc2ac3add8f505e29483f40127813edfcb141a Author: John Baldwin AuthorDate: 2022-04-09 01:31:29 +0000 Commit: John Baldwin CommitDate: 2022-05-13 17:44:43 +0000 bcm2835_audio_callback: Don't process garbage if there is no message. If vchi_msg_dequeue failed due to an empty queue, return rather than treating stack garbage as a valid message. (cherry picked from commit 4f6be8c788ca0339a84e935515d290b59dbec31b) --- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index ae2c9a14fc62..da5939ec33cb 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -207,6 +207,8 @@ bcm2835_audio_callback(void *param, const VCHI_CALLBACK_REASON_T reason, void *m status = vchi_msg_dequeue(sc->vchi_handle, &m, sizeof m, &msg_len, VCHI_FLAGS_NONE); + if (status != 0) + return; if (m.type == VC_AUDIO_MSG_TYPE_RESULT) { if (m.u.result.success) { device_printf(sc->dev,