From nobody Tue Jan 24 22:11:06 2023 X-Original-To: dev-commits-src-all@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 4P1h4q0VJSz3bf33; Tue, 24 Jan 2023 22:11:07 +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 4P1h4p4Gtxz4MQL; Tue, 24 Jan 2023 22:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598266; 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=N1TQL8fiOgUDdpSN2jwaHV+6qsuOs9nf/+fb7eT0/l0=; b=rCu7bgZ3+nKqA1ufx0Q0rqqj/nwnhIk4SpsVuoqyf4fAdtm58qKnUYpFushqAH4dgqRpjq vDPKmxtFqgdpfAOm6nEmZPoooBqYICG5UbDYXddh22IJ0P7lJ54XoElB4DczO64G8Rvcla Hynq4d2ZXlp7Wge0ZMFvndU0JZsDt37frQTxisit6HLzbnJM2Z8Xr3byJsqb6OuPkL3erQ C2H+oc66JkuL2tZFO4bvEQvf5I2JuubA3WmejWXo52itwxw6qkKgvh3NvGwu+xZpBFWxoG pOegCi/xqHtuWFIwNhvqxcKzZujiyIXJfEYtN1kQlwuEa8ITJveyrKYY+6DkNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598266; 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=N1TQL8fiOgUDdpSN2jwaHV+6qsuOs9nf/+fb7eT0/l0=; b=NXTQbImwPmFJr6jaYKu//H+TMRRxv5/AhwHhynQ4JqaGhxvXq6fX4t4GsbcCLXZzriAaBE ESj1tpqDgBJtHEwlsf5/GC1HN+nCLhLeo/wUskqhQ0NXFUS4Kos1YCnG63NYefxkGmh22Y VolVmEdPosZTMRriJsEpNG5oWMpIHwJqzr5RCQPsjfol3eTnInNLojggNbVh+GVWQTbpd+ nMBJHIaF4vv4saXabYu2UOe/Jj54RodmTDbuWP6rDLi/ItqtQxHCVsoRhSdxURsKYbraq1 NGqLu6TZlFBGNntxDybosfIJd1f1nf8Vlcv1hW1kQiPr5339NbozHEYCcn9FBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598266; a=rsa-sha256; cv=none; b=W7M0OuJCZuB4yAAICVR6cKckATM5wGDFjHXsRTbe/pap8eHNx1miqC0DEom8hQ5Y5WTs0E B13GL6zRLW209/yU18qGB6KfZlBKLjDiC+PNeBaKE4jtpC4eCAESN5UOQUtTCw14LughXQ 4a+nZhwwlW8FKYpEBjg7S6kKLU9B2xVHj1ZHQXaNcXLn0fbkShLMBzNAx9S2TvoL6XfQew hMTFU3H1suLKKWzQvyJKdLkuUTe1weXUcTWMQpJBSrL37+IseKdbKiVZB6D3SoQTmHICdy GL0BJPgjNEYdnmOWQR5OPAfChPEcn0x6wzwQ6kmSe0tqiDVNzRdnCe1JOpxirQ== 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 4P1h4p3CCjzQFY; Tue, 24 Jan 2023 22:11:06 +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 30OMB6Ku083469; Tue, 24 Jan 2023 22:11:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMB62L083468; Tue, 24 Jan 2023 22:11:06 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:06 GMT Message-Id: <202301242211.30OMB62L083468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d70add87a61e - stable/13 - kboot: Properly cap number of segments loaded for kexec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d70add87a61ee95b587a2436c9cac0a546479c58 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d70add87a61ee95b587a2436c9cac0a546479c58 commit d70add87a61ee95b587a2436c9cac0a546479c58 Author: Warner Losh AuthorDate: 2022-06-29 22:31:23 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:25 +0000 kboot: Properly cap number of segments loaded for kexec Linux has an arbitrary limit of 16 segments. Make sure we don't load too many. Sponsored by: Netflix (cherry picked from commit 2870493f1f55d5c00e5593f336dc05805863db7f) --- stand/kboot/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index 79c03398ba6d..83ad0ceb8a18 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -340,15 +340,17 @@ time(time_t *tloc) return (rv); } -struct host_kexec_segment loaded_segments[128]; +struct host_kexec_segment loaded_segments[HOST_KEXEC_SEGMENT_MAX]; int nkexec_segments = 0; static ssize_t get_phys_buffer(vm_offset_t dest, const size_t len, void **buf) { int i = 0; - const size_t segsize = 4*1024*1024; + const size_t segsize = 8*1024*1024; + if (nkexec_segments == HOST_KEXEC_SEGMENT_MAX) + panic("Tried to load too many kexec segments"); for (i = 0; i < nkexec_segments; i++) { if (dest >= (vm_offset_t)loaded_segments[i].mem && dest < (vm_offset_t)loaded_segments[i].mem +