From owner-svn-src-head@freebsd.org Sat Sep 28 02:49:46 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CDFEDF8DE0; Sat, 28 Sep 2019 02:49:46 +0000 (UTC) (envelope-from jhibbits@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46gCn64qD6z3Cfb; Sat, 28 Sep 2019 02:49:46 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A09C22BA5; Sat, 28 Sep 2019 02:49:46 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8S2nkFE017568; Sat, 28 Sep 2019 02:49:46 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8S2nkUs017567; Sat, 28 Sep 2019 02:49:46 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201909280249.x8S2nkUs017567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 28 Sep 2019 02:49:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352831 - head/sys/contrib/ncsw/Peripherals/BM X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/contrib/ncsw/Peripherals/BM X-SVN-Commit-Revision: 352831 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Sep 2019 02:49:46 -0000 Author: jhibbits Date: Sat Sep 28 02:49:46 2019 New Revision: 352831 URL: https://svnweb.freebsd.org/changeset/base/352831 Log: dpaa(4): Fix memcpy size for threshold copy in NCSW contrib On 64-bit platforms uintptr_t makes the copy twice as large as it should be. This code isn't actually used in FreeBSD, since it's for guest mode only, not hypervisor mode, but fixing it for completeness sake. Reported by: bdragon (clang9 build) Modified: head/sys/contrib/ncsw/Peripherals/BM/bm.c Modified: head/sys/contrib/ncsw/Peripherals/BM/bm.c ============================================================================== --- head/sys/contrib/ncsw/Peripherals/BM/bm.c Sat Sep 28 02:15:23 2019 (r352830) +++ head/sys/contrib/ncsw/Peripherals/BM/bm.c Sat Sep 28 02:49:46 2019 (r352831) @@ -258,7 +258,7 @@ t_Error BmSetPoolThresholds(t_Handle h_Bm, uint8_t bpi memset(&msg, 0, sizeof(t_BmIpcMsg)); ipcPoolThresh.bpid = bpid; - memcpy(ipcPoolThresh.thresholds, thresholds, sizeof(uintptr_t) * MAX_DEPLETION_THRESHOLDS); + memcpy(ipcPoolThresh.thresholds, thresholds, sizeof(uint32_t) * MAX_DEPLETION_THRESHOLDS); msg.msgId = BM_SET_POOL_THRESH; memcpy(msg.msgBody, &ipcPoolThresh, sizeof(t_BmIpcPoolThreshParams)); if ((errCode = XX_IpcSendMessage(p_Bm->h_Session,