From owner-svn-src-head@freebsd.org Fri Aug 31 16:15:47 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 787D7FCF9DE; Fri, 31 Aug 2018 16:15:47 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 328FB7A14A; Fri, 31 Aug 2018 16:15:47 +0000 (UTC) (envelope-from br@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 13A5B1D8F0; Fri, 31 Aug 2018 16:15:47 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7VGFkna086703; Fri, 31 Aug 2018 16:15:46 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7VGFkbH086702; Fri, 31 Aug 2018 16:15:46 GMT (envelope-from br@FreeBSD.org) Message-Id: <201808311615.w7VGFkbH086702@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Fri, 31 Aug 2018 16:15:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338409 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: br X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 338409 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.27 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: Fri, 31 Aug 2018 16:15:47 -0000 Author: br Date: Fri Aug 31 16:15:46 2018 New Revision: 338409 URL: https://svnweb.freebsd.org/changeset/base/338409 Log: Fix an integer overflow while setting the kernel address (MODINFO_ADDR). This eliminates build warning and makes kldstat happy. Approved by: re (marius) Modified: head/sys/riscv/riscv/machdep.c Modified: head/sys/riscv/riscv/machdep.c ============================================================================== --- head/sys/riscv/riscv/machdep.c Fri Aug 31 16:10:01 2018 (r338408) +++ head/sys/riscv/riscv/machdep.c Fri Aug 31 16:15:46 2018 (r338409) @@ -734,13 +734,15 @@ cache_setup(void) vm_offset_t fake_preload_metadata(struct riscv_bootparams *rvbp __unused) { + static uint32_t fake_preload[35]; #ifdef DDB vm_offset_t zstart = 0, zend = 0; #endif vm_offset_t lastaddr; - int i = 0; - static uint32_t fake_preload[35]; + int i; + i = 0; + fake_preload[i++] = MODINFO_NAME; fake_preload[i++] = strlen("kernel") + 1; strcpy((char*)&fake_preload[i++], "kernel"); @@ -751,12 +753,13 @@ fake_preload_metadata(struct riscv_bootparams *rvbp __ i += 3; fake_preload[i++] = MODINFO_ADDR; fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = (uint64_t)(KERNBASE + KERNENTRY); + *(vm_offset_t *)&fake_preload[i++] = + (vm_offset_t)(KERNBASE + KERNENTRY); i += 1; fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint64_t); - printf("end is 0x%016lx\n", (uint64_t)&end); - fake_preload[i++] = (uint64_t)&end - (uint64_t)(KERNBASE + KERNENTRY); + fake_preload[i++] = sizeof(vm_offset_t); + fake_preload[i++] = (vm_offset_t)&end - + (vm_offset_t)(KERNBASE + KERNENTRY); i += 1; #ifdef DDB #if 0