From nobody Tue May 02 12:20:42 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 4Q9fLM1CMbz48wDr; Tue, 2 May 2023 12:20:43 +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 4Q9fLL67s6z3tgS; Tue, 2 May 2023 12:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683030042; 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=dqVMgIoRUiWnGQETenOZsfGar4NP+8/8XpiupNqJkWg=; b=LLfotNiLnZpuxy/InUNHDW45gVwXSKUVXTZw/F+SxOUyaMisK6EILrbPCbvNKtrokRk8HA ZqRqwjlZpo7Au+bh5H4rXuLJ0oujr5Yu171lLZxM7/O/aV6QUrfkdibeeejd33O7W8C/7d ouE7DbA0XxhN5pSxg0Ws41xTG/KnfJ6/l7TAKjqKRZ3xT6FZimUXx1xW4BdwY7OeGa+Jx2 c587GnJD2mbGx96BSoeOIFAP9GZVPe39UgnahfJmrTMzR0ZTWPXnnc+9NE7IE/nb9YRhWZ CXWvAJiO2WLdkajLw62Y4dDNRL78U+BzNgsClzPbSpyhokOL0sGS+IsXYtjjhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683030042; 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=dqVMgIoRUiWnGQETenOZsfGar4NP+8/8XpiupNqJkWg=; b=mItCIar7KeQbzJ/4+B3lv02awxUylnuU598+trdfGMD93K5Mo+5w7kF8oL/bXz9w7oRv18 KjoZMr3RCQJLq6QsZfOWWiImZ9AKFCO5gDkI2Q7A9HXyD8OhCAEdgdtAlUO+fKZfQbKONz 9eVlAX8DPy3DMUnp6x3I5SR+MFTichljZRB5k3Z1tCdhSOj7rhD9gOH5dSa94gKO33HKWx ZOUug4fftM6PmrE8w9jJzGtYVn2h+syeo4AIzXEmVrsT+alKFBsK1xIFWoGKxD1cHv/SsM ikJp+UMWZPT4lGTKcqYAT6FL7FTAIEuoNTbEYgNmQR5nW+9n4Afr1lWZGDJGXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683030042; a=rsa-sha256; cv=none; b=YFkMwRNGyMjXWufZQI5dyRCe8lEMDBwvE2HQl8y0g0IGNEgvhSyZwJJPg/5hlmVEDTNsbd 1lJn61Y8c6YCx8quO0ZyOYyR91n0sKWXrSEqVB0SwB9QDFfkgfW4DhDnpDrzebC5n14so7 gvMnb4hqDWHq5dybY3pLVC7Er9PhFf9Ztr4la8L6m4baiuwJHWS+V0L+LoBpdfE5eMtovx WtGh/SpKaorq3HrmToIqy4zdP3elICVowAU3Qa68RDt1079rxPx8To+tE/ChgPBhqOMKlp cmQvSo4q79MUbQMKjqHyPv+/BhhFPm3NwZ3sp8vJsx750yGcFseRCXOg2v8pxw== 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 4Q9fLL58jfznR7; Tue, 2 May 2023 12:20:42 +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 342CKg7P067632; Tue, 2 May 2023 12:20:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342CKgHs067631; Tue, 2 May 2023 12:20:42 GMT (envelope-from git) Date: Tue, 2 May 2023 12:20:42 GMT Message-Id: <202305021220.342CKgHs067631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 485005801104 - stable/12 - mpr: don't use hardcoded value in debug branch 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4850058011041b5e3b1956cd76016f6cc50dc979 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=4850058011041b5e3b1956cd76016f6cc50dc979 commit 4850058011041b5e3b1956cd76016f6cc50dc979 Author: Mariusz Zaborski AuthorDate: 2023-04-21 07:57:38 +0000 Commit: Mariusz Zaborski CommitDate: 2023-05-02 12:19:35 +0000 mpr: don't use hardcoded value in debug branch Pointed out by: imp Sponsored by: Klara Inc. (cherry picked from commit 444c6615459efe2b015deb1cffc54fcaa3ea1fca) --- sys/dev/mpr/mpr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index 33afb7adf852..562d629c7afa 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -2790,9 +2790,9 @@ mpr_update_events(struct mpr_softc *sc, struct mpr_event_handle *handle, evtreq->SASBroadcastPrimitiveMasks = 0; #ifdef MPR_DEBUG_ALL_EVENTS { - u_char fullmask[16]; - memset(fullmask, 0x00, 16); - bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16); + u_char fullmask[sizeof(evtreq->EventMasks)]; + memset(fullmask, 0x00, sizeof(fullmask)); + bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, sizeof(fullmask)); } #else bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask)); @@ -2846,9 +2846,9 @@ mpr_reregister_events(struct mpr_softc *sc) evtreq->SASBroadcastPrimitiveMasks = 0; #ifdef MPR_DEBUG_ALL_EVENTS { - u_char fullmask[16]; - memset(fullmask, 0x00, 16); - bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16); + u_char fullmask[sizeof(evtreq->EventMasks)]; + memset(fullmask, 0x00, sizeof(fullmask)); + bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, sizeof(fullmask)); } #else bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask));