From nobody Thu Jan 23 05:56:39 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1737457110; cv=none; d=zohomail.com; s=zohoarc; b=T6D2zt5uLMU/MR/otKZeGP0i7R3mvXiuJ0bjfgQGsWFp51igLlxYszh/XoJ9tNyXhd4tXUCfwerLWHtbklYujvL2IX4ZFDFyH7RSafiioZlSXmII/7aIdtBVtppqKW+3j/OClJdyKazoZzWqbOajcrK2PKvdLh4viyEXHdAM1Us= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737457110; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rOWdPqUs+IftHtvHWcghIGatiIiKcgenGAsSUpAA+Go=; b=Ky6MPllMmGv3FboudlyJwzBsHgpin1YadoVxYoZEm7nAbzfRDdEL/He170uIHIuGTxgt7KXOr/Wl3P6PwUvnKvzpdKQgYpPjyrXNGp8dNNuXH+My5yLu1jb9TqM3zKIb6Ami5ch7jZ3DzGj12tws5wcxSslFlNHTntLdJ4iKu3Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1737457110985789.9827683173797; Tue, 21 Jan 2025 02:58:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taBw9-0006hW-Cu; Tue, 21 Jan 2025 05:56:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1taBw6-0006gN-T5 for qemu-devel@nongnu.org; Tue, 21 Jan 2025 05:56:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1taBw3-00057f-Op for qemu-devel@nongnu.org; Tue, 21 Jan 2025 05:56:46 -0500 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-642-oiGIEKTLPD-xDvhdZcwxug-1; Tue, 21 Jan 2025 05:56:37 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BB48B19560BB; Tue, 21 Jan 2025 10:56:36 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.56]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CF96919560A7; Tue, 21 Jan 2025 10:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737457002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rOWdPqUs+IftHtvHWcghIGatiIiKcgenGAsSUpAA+Go=; b=MFbbTxPKXOqLLTVLTupHESG5N4RwJUS7kzI5IuhhkTGMwzt2BKu5P0AAg3DHB/u2391Z27 /OmBLrYLWpikBhbu9nOiF16+9jR34MwIj3SfuDg3CIFJj3N3gpJ74HFKzvYh31yLlwL1ia oJmDSVkg3jpjgh5eostlaAPrCbE9elA= X-MC-Unique: oiGIEKTLPD-xDvhdZcwxug-1 X-Mimecast-MFC-AGG-ID: oiGIEKTLPD-xDvhdZcwxug From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Jared Rossi Subject: [PULL 8/9] pc-bios/s390-ccw: Abort IPL on invalid loadparm Date: Tue, 21 Jan 2025 11:56:10 +0100 Message-ID: <20250121105613.1286672-9-thuth@redhat.com> In-Reply-To: <20250121105613.1286672-1-thuth@redhat.com> References: <20250121105613.1286672-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-3, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.036, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1737457113027019000 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Because the loadparm specifies an exact kernel the user wants to boot, if t= he loadparm is invalid it must represent a misconfiguration of the guest. Thus= we should abort the IPL immediately, without attempting to use other devices, = to avoid booting into an unintended guest image. Signed-off-by: Jared Rossi Message-ID: <20250117212235.1324063-2-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/bootmap.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 56f2f75640..0f8baa0198 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -336,8 +336,7 @@ static int run_eckd_boot_script(block_number_t bmt_bloc= k_nr, =20 debug_print_int("loadparm", loadparm); if (loadparm >=3D MAX_BOOT_ENTRIES) { - puts("loadparm value greater than max number of boot entries allow= ed"); - return -EINVAL; + panic("loadparm value greater than max number of boot entries allo= wed"); } =20 memset(sec, FREE_SPACE_FILLER, sizeof(sec)); @@ -348,8 +347,8 @@ static int run_eckd_boot_script(block_number_t bmt_bloc= k_nr, =20 block_nr =3D gen_eckd_block_num(&bmt->entry[loadparm].xeckd, ldipl); if (block_nr =3D=3D NULL_BLOCK_NR) { - puts("Cannot find Boot Map Table Entry"); - return -EIO; + printf("The requested boot entry (%d) is invalid\n", loadparm); + panic("Invalid loadparm"); } =20 memset(sec, FREE_SPACE_FILLER, sizeof(sec)); @@ -792,8 +791,12 @@ static int ipl_scsi(void) =20 debug_print_int("loadparm", loadparm); if (loadparm >=3D MAX_BOOT_ENTRIES) { - puts("loadparm value greater than max number of boot entries allow= ed"); - return -EINVAL; + panic("loadparm value greater than max number of boot entries allo= wed"); + } + + if (!valid_entries[loadparm]) { + printf("The requested boot entry (%d) is invalid\n", loadparm); + panic("Invalid loadparm"); } =20 return zipl_run(&prog_table->entry[loadparm].scsi); --=20 2.48.1