From nobody Wed Jun 21 05:42:10 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 4QmC7Q4s4tz4g1vW; Wed, 21 Jun 2023 05:42:10 +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 4QmC7Q37l7z3k45; Wed, 21 Jun 2023 05:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326130; 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=HHQlfJvkbOnjFXBIFRP6aawrky4BClMCff3N+nFHjGc=; b=TGtQy+PXgU8Swk98sOD5rwu20DIK+gr4sq4UWXkNJvz/8weoJP+FTqUIbTmEB1sK64VdqB UORpcgf2/sX8YWOPt+oyLiZdNpFa4extvC+HMHu3OJSd+h0R2PpKQGwmUzOZHt6hC7EsIT aQYN81HbXajK3Pj3hCKJ/KgAbazVbvjPcsxdKgFoKDPH7hm2a81UB4oEohWeavPSq0yBY8 dF/4bOpft+eBhJQk4kdU/5LbT8h74xaAWcfbSMvoi/E0thw334eb5rVJ6NkhcdATB9Greg 15Ao3sOHsQilAS0ndrGZ9eAL8WYsNt2c26xH5Ooz/4o53pMidd9ww7DJfh60+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326130; 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=HHQlfJvkbOnjFXBIFRP6aawrky4BClMCff3N+nFHjGc=; b=fT0y3VwLKEWE4EfSTcSLGtdMtbNEOwt/iP4CzhHH0PMUG7eBEUOEkgj6Vw+g4usgJdaAqD yJdwnvsSO6Q0644CpK8+q2QAp9kZpU42++SfP3GoKMaFKP5oTdRsjWQ4agRkVc7dp5B2zO /q5e51i7HvLLFg5kf9Qbhjc+hpQLxv7xIDHXI5NRTBX6TR/guXB1C5j9tem+bu3CVwhNxm Yo/RUCT7lNSZDJ6cViquoRVPWS1ctM9gh+Do8LyY6dFlZJBEqjdOicE8mmwQh+R6Ep4cWp OC/hqLGrNEUfu43ITT4ABdtkgCDLBXf6Reufs/QVuWfNgK1QUxuNf9/EKDbDFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687326130; a=rsa-sha256; cv=none; b=Kj/6I4fPUMYRKlo6GPrgr3JLaAosSGcfnn66RsNPnUbQYjId6lW4skSAreon1/auTRhKwD 0fTMXoy4p/d68LeOBmzTdk9XnTKnkCro1F35mhPOs10qm3WTMCklScjJ0i+Foycnx1CU88 zYOyfzE/p7gBBAWgSGjtvfVe/2Rot05X6A9mNs3cyaAvvhLBHpJCiC1ah9ldJUizBJU3Qj iP2rFRPYujTP0qExkqnZtQzWNPxTs2srcocGunjT4sjycDPEYVfGJvM2hmqY9E/2pa5YNT biAqedfYyRPRlc4lawvY4KISPIJ2LRalgmvFp4nW0Wtc9Jfpk6/QEk0CFRQhEA== 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 4QmC7Q150SzVc9; Wed, 21 Jun 2023 05:42:10 +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 35L5gA3D062974; Wed, 21 Jun 2023 05:42:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5gAnY062973; Wed, 21 Jun 2023 05:42:10 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:42:10 GMT Message-Id: <202306210542.35L5gAnY062973@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: bc61a15ededc - releng/13.1 - mpr: fix copying of event_mask 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: bc61a15ededc1b49ea183b1d23b8bcdbee64d99f 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=bc61a15ededc1b49ea183b1d23b8bcdbee64d99f commit bc61a15ededc1b49ea183b1d23b8bcdbee64d99f Author: Mariusz Zaborski AuthorDate: 2023-04-21 07:50:16 +0000 Commit: Gordon Tetlow CommitDate: 2023-06-21 05:07:50 +0000 mpr: fix copying of event_mask Before the commit 6cc44223cb6717795afdac4348bbe7e2a968a07d the field event_mask was fully copied to the EventMasks field. After this commit the event_mask (uint8_t) is 4 times casted to EventMask (uint32_t). Because of that 24 bits of each event_mask array is lost. This commits brings back simple copying of field, and after words converting 32 bits field to the requested endian. I don't think we need more sophisticated method, as the array is of size 4 (for 32 bits version). Reviewed by: imp MFC after: 1 week Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D39562 (cherry picked from commit ea6597c38c77c7bfaae71259d8636cbb89add6a3) (cherry picked from commit e7a3a08febd01c95b74185bb971ec29cca64b8e1) Approved by: so Security: FreeBSD-EN-23:07.mpr --- sys/dev/mpr/mpr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index 0f4c5c906216..fe8ca620b7c8 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -2764,8 +2764,9 @@ mpr_update_events(struct mpr_softc *sc, struct mpr_event_handle *handle, bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16); } #else + bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask)); for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++) - evtreq->EventMasks[i] = htole32(sc->event_mask[i]); + evtreq->EventMasks[i] = htole32(evtreq->EventMasks[i]); #endif cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; cm->cm_data = NULL; @@ -2819,8 +2820,9 @@ mpr_reregister_events(struct mpr_softc *sc) bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16); } #else + bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask)); for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++) - evtreq->EventMasks[i] = htole32(sc->event_mask[i]); + evtreq->EventMasks[i] = htole32(evtreq->EventMasks[i]); #endif cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; cm->cm_data = NULL;