From owner-svn-src-all@freebsd.org Tue Mar 7 03:35:51 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 D19CBCF7419; Tue, 7 Mar 2017 03:35:51 +0000 (UTC) (envelope-from dexuan@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 A13AF19EA; Tue, 7 Mar 2017 03:35:51 +0000 (UTC) (envelope-from dexuan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v273Zo09023136; Tue, 7 Mar 2017 03:35:50 GMT (envelope-from dexuan@FreeBSD.org) Received: (from dexuan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v273Zogt023135; Tue, 7 Mar 2017 03:35:50 GMT (envelope-from dexuan@FreeBSD.org) Message-Id: <201703070335.v273Zogt023135@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dexuan set sender to dexuan@FreeBSD.org using -f From: Dexuan Cui Date: Tue, 7 Mar 2017 03:35:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314828 - head/sys/boot/efi/loader X-SVN-Group: head 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: Tue, 07 Mar 2017 03:35:51 -0000 Author: dexuan Date: Tue Mar 7 03:35:50 2017 New Revision: 314828 URL: https://svnweb.freebsd.org/changeset/base/314828 Log: loader.efi: fix an off-by-one bug in efi_verify_staging_size() Also remove the warning message: it may not be unusual to see the memory range containing 2MB is not of EfiConventionalMemory. MFC after: 2 weeks2 weeks Sponsored by: Microsoft Modified: head/sys/boot/efi/loader/copy.c Modified: head/sys/boot/efi/loader/copy.c ============================================================================== --- head/sys/boot/efi/loader/copy.c Tue Mar 7 03:01:09 2017 (r314827) +++ head/sys/boot/efi/loader/copy.c Tue Mar 7 03:35:50 2017 (r314828) @@ -79,10 +79,6 @@ efi_verify_staging_size(unsigned long *n KERNEL_PHYSICAL_BASE >= end) continue; - if (p->Type != EfiConventionalMemory) - printf("Warning: wrong EFI memory type: %d\n", - p->Type); - available_pages = p->NumberOfPages - ((KERNEL_PHYSICAL_BASE - start) >> EFI_PAGE_SHIFT); break; @@ -93,6 +89,7 @@ efi_verify_staging_size(unsigned long *n goto out; } + i++; for ( ; i < ndesc; i++, p = NextMemoryDescriptor(p, dsz)) { if (p->Type != EfiConventionalMemory &&