From nobody Sat Sep 17 21:27:37 2022 X-Original-To: dev-commits-src-main@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 4MVPDB0DYqz4cX58; Sat, 17 Sep 2022 21:27:38 +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 4MVPD96qV2z44TR; Sat, 17 Sep 2022 21:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663450058; 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=kjcSUsw+Egfdt3bh7DhAKpgReTrYYndLDJXRo6IKemU=; b=v+1PmNF+pAIsrritXo9ngLKEl1XAZfe1brSVqyojOUhiDm1waiIS2Aoqrv5osZwWK5WJo+ zBGJubhW7RQcI2ExslaTHJMo83fa7/DUDkdvuFS8D5i9fY+l7Y5DKrynQX/8jkFEa1NrFE tWQsryggKQXY1Afd6uaNMnYzlLcx30lDnyYnSua6Q2UBJmwKzLri/+JyMaU2ejSr6+n/gY H/zho8e98znYyiJsLfw480SvprY5VW7c6P4mf00ifGnrXjx/4j0nFTaZ7mq1NiCksnhkUi 26fD8lUhAqR7XqJqLJbc1zOtvnHueTMGlSw+6IZ/EI1MS/ClX6ptN+dp7fHa0Q== 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 4MVPD95q2Dzq2K; Sat, 17 Sep 2022 21:27:37 +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 28HLRbQb097996; Sat, 17 Sep 2022 21:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HLRbLK097995; Sat, 17 Sep 2022 21:27:37 GMT (envelope-from git) Date: Sat, 17 Sep 2022 21:27:37 GMT Message-Id: <202209172127.28HLRbLK097995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4a676571e382 - main - stand: Pass in the proper size for bootinfo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a676571e382d0188b98134732f421df57a47a87 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663450058; 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=kjcSUsw+Egfdt3bh7DhAKpgReTrYYndLDJXRo6IKemU=; b=EZxqknLx4Wk6DikB5qtbBxVDhe7hV3eF1Xe6ArLJAILUog0niwtXAEj2kMgpulyK3Y88jI 622JEekYLmyfxIvUHR981v+3w9IU3JEu4GA9cBvxr220jRTrQF3fngDMZZiP2jJ6j7C+sG Qu1OqIE+p2eTCa3/B23gAWrY+i33mLIF6aYHfi6uSsvPcb1KlPHRw+nyVs6A08FGHukUzc JI9UGX+9SdHyTxhcq6Jcn7NVWxu5D4DmUYXOoZKu5Cp8GfqyrH+lEw4Ku9Bq76dwMoUSWc zKlg1N4+YJ+1im8A9EgCnGLkKkK/wQkblilXXA65a43pqUogEG1RF7PUdKBEPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663450058; a=rsa-sha256; cv=none; b=mjIeK/aIHo/1d8oJ4OMwXfUY55oGpkRXigwDL8wF6AgQGos5n6GZVfXCVB9XbnP7EBuTGd H0q70GTjiqmDnhUK3GfSTb9S0CQUF8ZLvWQ2eWRgQzcI59feXOl4S1UMI3f0QS4f2ZOS+f l30lzStC/e/L7wPjjRLs67U3FVGTnWn8ZeFPQa4L12apu5y2bLYhApA5YSvSiH+BRazRvt SZM+Cs7YlgRhNvNBcJJQdy1v9kIs9qo1OUi0kYYG5rnkPP35ColdvrfIfLY0MnqyCCGL5z 27FEtDJZ5jAAO9lnb3xmJBL3K9w5DgY4JqVIZpbOFpKS88Gq5S1p++1Dhm+zWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4a676571e382d0188b98134732f421df57a47a87 commit 4a676571e382d0188b98134732f421df57a47a87 Author: Warner Losh AuthorDate: 2022-09-17 21:15:51 +0000 Commit: Warner Losh CommitDate: 2022-09-17 21:18:29 +0000 stand: Pass in the proper size for bootinfo Missed one sizeof(bi) -> sizeof(*bi) in 9758dd3de1cdd conversion to allocating bootinfo. Noticed by: tijl@ Fixes: 9758dd3de1cdd Sponsored by: Netflix --- stand/i386/libi386/bootinfo32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c index 37a797289f2b..169d2dfb81f4 100644 --- a/stand/i386/libi386/bootinfo32.c +++ b/stand/i386/libi386/bootinfo32.c @@ -174,7 +174,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t kernelname = getenv("kernelname"); i386_getdev(NULL, kernelname, &kernelpath); bi->bi_version = BOOTINFO_VERSION; - bi->bi_size = sizeof(bi); + bi->bi_size = sizeof(*bi); bi->bi_memsizes_valid = 1; bi->bi_basemem = bios_basemem / 1024; bi->bi_extmem = bios_extmem / 1024;