From owner-svn-src-all@freebsd.org Thu Jun 29 04:33:57 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F8E8D92033; Thu, 29 Jun 2017 04:33:57 +0000 (UTC) (envelope-from tsoome@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 mx1.freebsd.org (Postfix) with ESMTPS id D1E9A7513C; Thu, 29 Jun 2017 04:33:56 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5T4XuP0097387; Thu, 29 Jun 2017 04:33:56 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5T4Xtx0097385; Thu, 29 Jun 2017 04:33:55 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201706290433.v5T4Xtx0097385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Thu, 29 Jun 2017 04:33:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320467 - in head/sys/boot/i386: libi386 loader X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: in head/sys/boot/i386: libi386 loader X-SVN-Commit-Revision: 320467 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jun 2017 04:33:57 -0000 Author: tsoome Date: Thu Jun 29 04:33:55 2017 New Revision: 320467 URL: https://svnweb.freebsd.org/changeset/base/320467 Log: loader: chain load relocate data declaration is bad The implementation is using fixed size array allocated in asm module, need to use proper array declaration for C source. CID: 1376405 Reported by: Coverity, cem Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D11321 Modified: head/sys/boot/i386/libi386/libi386.h head/sys/boot/i386/loader/chain.c Modified: head/sys/boot/i386/libi386/libi386.h ============================================================================== --- head/sys/boot/i386/libi386/libi386.h Thu Jun 29 03:59:02 2017 (r320466) +++ head/sys/boot/i386/libi386/libi386.h Thu Jun 29 04:33:55 2017 (r320467) @@ -71,7 +71,10 @@ struct relocate_data { extern void relocater(void); -extern uint32_t relocater_data; +/* + * The relocater_data[] is fixed size array allocated in relocater_tramp.S + */ +extern struct relocate_data relocater_data[]; extern uint32_t relocater_size; extern uint16_t relocator_ip; Modified: head/sys/boot/i386/loader/chain.c ============================================================================== --- head/sys/boot/i386/loader/chain.c Thu Jun 29 03:59:02 2017 (r320466) +++ head/sys/boot/i386/loader/chain.c Thu Jun 29 04:33:55 2017 (r320467) @@ -58,7 +58,6 @@ command_chain(int argc, char *argv[]) int fd, len, size = SECTOR_SIZE; struct stat st; vm_offset_t mem = 0x100000; - uint32_t *uintptr = &relocater_data; struct i386_devdesc *rootdev; if (argc == 1) { @@ -108,9 +107,9 @@ command_chain(int argc, char *argv[]) return (CMD_ERROR); } - uintptr[0] = mem; - uintptr[1] = 0x7C00; - uintptr[2] = SECTOR_SIZE; + relocater_data[0].src = mem; + relocater_data[0].dest = 0x7C00; + relocater_data[0].size = SECTOR_SIZE; relocator_edx = bd_unit2bios(rootdev->d_unit); relocator_esi = relocater_size;