From nobody Wed Feb 8 18:15:17 2023 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 4PBp7n5DFKz3nknK; Wed, 8 Feb 2023 18:15:17 +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 4PBp7n4C2cz3qQl; Wed, 8 Feb 2023 18:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675880117; 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=aEBrzdU78sAVXthTxljzaxnZ5Lim/Fe8RHxfz7VEtHg=; b=yWcVaQfbBzhCeMfCFPBNckyn9o1n7rdn15v11V3zL4M9Y40GPGaWnrpiukbKWWC4RjK1jE QOxU5oK43Fvy8JWtXLBFJGjlBuVrrJHCDdh/P0XUSmjAzrwILt9sGlkP/4BupEbgq+RdgN MeQRIinzo4zRmup06kv0IkIcwsS/jHSobQMsRM2dWbU5s2E2eegCUTF727KK/ElPR0sx0Q DOIvQ6CL1Euf2HHmNd0WYFhBb5UQ8QDmfOXEN31xo+dVsJHpiVwV5wQEkON+TV3FxePUPc 4VUuJXF4mW8yxSA5GfUBWcimG9Ao6P4QHB5MQxnhYb291B+T3/fB9ZEIdSWuMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675880117; 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=aEBrzdU78sAVXthTxljzaxnZ5Lim/Fe8RHxfz7VEtHg=; b=icI2Q4nTOD7gYmL/f/Qu+CjkRCbLgQ02PtBNkIijeCCtYu2N2tXTO6LL8Eze+Llbnpjlx4 hmX1VevLHHxBc45YmrQoPp3qFdLgZ4li6qfaNvcLd9ael3UPqhqE23Un4f1UL42MrNL6An IM4xB9iNW8xXIAnQe1hjyKPZm6WBpv7nmHT+qZkXY7CZFOJplCaiHWjhOPMHXKnt5F67fr bDxSj/fNaih5xt9w082giCXMyl79GaHR0CDlzwvJHrE259JYNGi2dVNYmnSFutQmroJIhH oH8VyMf/Er6foA9868W7bR1f8tUMtkpWCe8J/GGZh45GLHkTY0eyFu3DS8l0Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675880117; a=rsa-sha256; cv=none; b=M5yqYgeLaeKOZ8jCAyRXvkY8nYC7XlOa2fCtWtnKNBFKKfX/Wi/Y2u179pnprGFNUeggsP dfSWrMb23IdlrDOWHEbRLWOIMN0spfZwwKDl+NzxohssGoYup7hkd0hiMkyTGVeeXj0GaA p+e84ql36JvUhBYtbz1tVrJmBX9zJkEmXa6F1B6Jymmy+SuHYtabpq9F72Uki7SqD5/Dfs eNe3vmtkLSX82KhrWWDgmHjNSG6rUqmtB2J/orgtWJrHQjaJBOPVcjX72KjBbXQn5UIG7l ///aKvxfnvnU0MDBLf6QmXLDYpY4dJPj6UHf1nUFDxGGbv815gi3hdpu4Bie4A== 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 4PBp7n39tZz15Mp; Wed, 8 Feb 2023 18:15:17 +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 318IFHpW022285; Wed, 8 Feb 2023 18:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 318IFH7k022284; Wed, 8 Feb 2023 18:15:17 GMT (envelope-from git) Date: Wed, 8 Feb 2023 18:15:17 GMT Message-Id: <202302081815.318IFH7k022284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 4b31a7861af0 - releng/13.1 - Fix sdhci(4) broken write-protect settings. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 4b31a7861af02ec5c1528e20d375a7e9813cdc80 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=4b31a7861af02ec5c1528e20d375a7e9813cdc80 commit 4b31a7861af02ec5c1528e20d375a7e9813cdc80 Author: Gordon Tetlow AuthorDate: 2023-02-08 16:16:31 +0000 Commit: Gordon Tetlow CommitDate: 2023-02-08 16:16:31 +0000 Fix sdhci(4) broken write-protect settings. Approved by: so Security: FreeBSD-EN-23:02.sdhci --- sys/dev/sdhci/sdhci_xenon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c index b6f7513245eb..7ed94907e478 100644 --- a/sys/dev/sdhci/sdhci_xenon.c +++ b/sys/dev/sdhci/sdhci_xenon.c @@ -183,7 +183,7 @@ sdhci_xenon_get_ro(device_t bus, device_t dev) struct sdhci_xenon_softc *sc = device_get_softc(bus); return (sdhci_generic_get_ro(bus, dev) ^ - (sc->mmc_helper.props & MMC_PROP_WP_INVERTED)); + !!(sc->mmc_helper.props & MMC_PROP_WP_INVERTED)); } static bool