SeaBIOS April 2019

seabios@seabios.org

9 participants
14 discussions

[PATCH v2] bootmenu: add support for more than 9 entries

by Gerd Hoffmann

10th and following entries can be selected using letters. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/util.h | 1 + src/boot.c | 49 ++++++++++++++++++++++++++++++++++--------------- src/kbd.c | 19 +++++++++++++++++-- 3 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/util.h b/src/util.h index 9c06850353a4..c8e3b818d23e 100644 --- a/src/util.h +++ b/src/util.h @@ -189,6 +189,7 @@ void handle_15c2(struct bregs *regs); void process_key(u8 key); u8 enqueue_key(u16 keycode); u16 ascii_to_keycode(u8 ascii); +u16 ascii_to_scancode(u8 ascii); // misc.c extern int HaveRunPost; diff --git a/src/boot.c b/src/boot.c index 9f82f3ca0c3e..43160f8ee5b9 100644 --- a/src/boot.c +++ b/src/boot.c @@ -465,6 +465,14 @@ get_keystroke(int msec) #define DEFAULT_BOOTMENU_WAIT 2500 +static const char menuchars[] = { + '1', '2', '3', '4', '5', '6', '7', '8', '9', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', + 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', + 's', /* skip t (tpm menu) */ + 'u', 'v', 'w', 'x', 'y', 'z' +}; + // Show IPL option menu. void interactive_bootmenu(void) @@ -497,12 +505,15 @@ interactive_bootmenu(void) // Show menu items int maxmenu = 0; - struct bootentry_s *pos; + struct bootentry_s *pos, *boot = NULL; hlist_for_each_entry(pos, &BootList, node) { char desc[77]; - maxmenu++; - printf("%d. %s\n", maxmenu + if (maxmenu >= ARRAY_SIZE(menuchars)) { + break; + } + printf("%c. %s\n", menuchars[maxmenu] , strtcpy(desc, pos->description, ARRAY_SIZE(desc))); + maxmenu++; } if (tpm_can_show_menu()) { printf("\nt. TPM Configuration\n"); @@ -521,23 +532,31 @@ interactive_bootmenu(void) printf("\n"); tpm_menu(); } - if (scan_code >= 1 && scan_code <= maxmenu+1) + if (scan_code == 1) { + // ESC + printf("\n"); + return; + } + + maxmenu = 0; + hlist_for_each_entry(pos, &BootList, node) { + if (maxmenu >= ARRAY_SIZE(menuchars)) + break; + if (scan_code == ascii_to_scancode(menuchars[maxmenu])) { + boot = pos; + break; + } + maxmenu++; + } + if (boot) break; } printf("\n"); - if (scan_code == 0x01) - // ESC - return; // Find entry and make top priority. - int choice = scan_code - 1; - hlist_for_each_entry(pos, &BootList, node) { - if (! --choice) - break; - } - hlist_del(&pos->node); - pos->priority = 0; - hlist_add_head(&pos->node, &BootList); + hlist_del(&boot->node); + boot->priority = 0; + hlist_add_head(&boot->node, &BootList); } // BEV (Boot Execution Vector) list diff --git a/src/kbd.c b/src/kbd.c index 15e5ae789cd3..f54d9fe94287 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -271,12 +271,12 @@ handle_16(struct bregs *regs) #define none 0 -static struct scaninfo { +struct scaninfo { u16 normal; u16 shift; u16 control; u16 alt; -} scan_to_keycode[] VAR16 = { +} scan_to_keycode[] VARFSEG = { { none, none, none, none }, { 0x011b, 0x011b, 0x011b, 0x01f0 }, /* escape */ { 0x0231, 0x0221, none, 0x7800 }, /* 1! */ @@ -390,6 +390,21 @@ u16 ascii_to_keycode(u8 ascii) return 0; } +u16 ascii_to_scancode(u8 ascii) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(scan_to_keycode); i++) { + if ((GET_GLOBAL(scan_to_keycode[i].normal) & 0xff) == ascii) + return i; + if ((GET_GLOBAL(scan_to_keycode[i].shift) & 0xff) == ascii) + return i; + if ((GET_GLOBAL(scan_to_keycode[i].control) & 0xff) == ascii) + return i; + } + return 0; +} + // Handle a ps2 style scancode read from the keyboard. static void kbd_set_flag(int key_release, u16 set_bit0, u8 set_bit1, u16 toggle_bit) -- 2.18.1

1 year, 5 months

[PATCH 1/2] bootmenu: add support for more than 9 entries

by Gerd Hoffmann

In case more than 9 entries are found in the boot menu switch into two digit mode, so entries 10 and above can actually be selected. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1693031 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/boot.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/src/boot.c b/src/boot.c index 9f82f3ca0c3e..a4795b9cb9a2 100644 --- a/src/boot.c +++ b/src/boot.c @@ -465,6 +465,18 @@ get_keystroke(int msec) #define DEFAULT_BOOTMENU_WAIT 2500 +static int scancode_to_digit(int scan_code) +{ + switch (scan_code) { + case 1 ... 10: + return scan_code - 1; + case 11: + return 0; + default: + return -1; + } +} + // Show IPL option menu. void interactive_bootmenu(void) @@ -495,14 +507,25 @@ interactive_bootmenu(void) printf("Select boot device:\n\n"); wait_threads(); - // Show menu items + // Count menu items int maxmenu = 0; struct bootentry_s *pos; + hlist_for_each_entry(pos, &BootList, node) + maxmenu++; + int twodigits = (maxmenu > 9); + + // Show menu items + maxmenu = 0; hlist_for_each_entry(pos, &BootList, node) { - char desc[77]; + char desc[76]; maxmenu++; - printf("%d. %s\n", maxmenu - , strtcpy(desc, pos->description, ARRAY_SIZE(desc))); + if (twodigits) { + printf("%d%d. %s\n", maxmenu / 10, maxmenu % 10 + , strtcpy(desc, pos->description, ARRAY_SIZE(desc))); + } else { + printf("%d. %s\n", maxmenu + , strtcpy(desc, pos->description, ARRAY_SIZE(desc))); + } } if (tpm_can_show_menu()) { printf("\nt. TPM Configuration\n"); @@ -513,6 +536,7 @@ interactive_bootmenu(void) // repeatedly hitting keys to enter the BIOS) will end up hitting ESC // multiple times and immediately booting the primary boot device. int esc_accepted_time = irqtimer_calc(menukey == 1 ? 1500 : 0); + int digit, digit1 = -1, choice = 0; for (;;) { scan_code = get_keystroke(1000); if (scan_code == 1 && !irqtimer_check(esc_accepted_time)) @@ -521,16 +545,48 @@ interactive_bootmenu(void) printf("\n"); tpm_menu(); } - if (scan_code >= 1 && scan_code <= maxmenu+1) - break; + if (scan_code < 0) { + // timeout + continue; + } + if (scan_code == 0x01) { + // ESC + printf("\n"); + return; + } + + digit = scancode_to_digit(scan_code); + if (digit < 0) { + // key isn't a digit + continue; + } + + if (twodigits) { + if (digit1 < 0) { + // first digit + printf("%d", digit); + digit1 = digit; + } else { + // second digit + printf("%d", digit); + choice = digit1 * 10 + digit; + if (choice >= 1 && choice <= maxmenu) { + printf(" - good choice, booting ...\n"); + break; + } + printf(" - invalid choice, try again\n"); + digit1 = -1; + } + } else { + if (digit >= 1 && digit <= maxmenu) { + choice = digit; + break; + } + } } printf("\n"); - if (scan_code == 0x01) - // ESC - return; // Find entry and make top priority. - int choice = scan_code - 1; hlist_for_each_entry(pos, &BootList, node) { if (! --choice) break; -- 2.18.1

1 year, 5 months

CFP: KVM Forum 2019

by Paolo Bonzini

================================================================ KVM Forum 2019: Call For Participation October 30-November 1, 2019 - Lyon Convention Center - Lyon, France (All submissions must be received before June 15, 2019 at 23:59 PST) ================================================================= KVM Forum is an annual event that presents a rare opportunity for developers and users to meet, discuss the state of Linux virtualization technology, and plan for the challenges ahead. We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2019. At this highly technical conference, developers driving innovation in the KVM virtualization stack (Linux, KVM, QEMU, libvirt) can meet users who depend on KVM as part of their offerings, or to power their data centers and clouds. KVM Forum will include sessions on the state of the KVM virtualization stack, planning for the future, and many opportunities for attendees to collaborate. As we celebrate ten years of KVM development in the Linux kernel, KVM continues to be a critical part of the FOSS cloud infrastructure. This year, KVM Forum is joining Open Source Summit in Lyon, France. Selected talks from KVM Forum will be presented on Wednesday October 30 to the full audience of the Open Source Summit. Also, attendees of KVM Forum will have access to all of the talks from Open Source Summit on Wednesday. https://events.linuxfoundation.org/events/kvm-forum-2019/program/call-for-p… Suggested topics: * Scaling, latency optimizations, performance tuning, real-time guests * Hardening and security * New features * Testing KVM and the Linux kernel: * Nested virtualization * Resource management (CPU, I/O, memory) and scheduling * VFIO: IOMMU, SR-IOV, virtual GPU, etc. * Networking: Open vSwitch, XDP, etc. * virtio and vhost * Architecture ports and new processor features QEMU: * Management interfaces: QOM and QMP * New devices, new boards, new architectures * Graphics, desktop virtualization and virtual GPU * New storage features * High availability, live migration and fault tolerance * Emulation and TCG * Firmware: ACPI, UEFI, coreboot, U-Boot, etc. Management and infrastructure * Managing KVM: Libvirt, OpenStack, oVirt, etc. * Storage: Ceph, Gluster, SPDK, etc.r * Network Function Virtualization: DPDK, OPNFV, OVN, etc. * Provisioning ======================== SUBMITTING YOUR PROPOSAL ======================== Abstracts due: June 15, 2019 Please submit a short abstract (~150 words) describing your presentation proposal. Slots vary in length up to 45 minutes. Submit your proposal here: https://events.linuxfoundation.org/events/kvm-forum-2019/program/call-for-p… Please only use the categories "presentation" and "panel discussion" You will receive a notification whether or not your presentation proposal was accepted by August 12, 2019. Speakers will receive a complimentary pass for the event. In case your submission has multiple presenters, only the primary speaker for a proposal will receive a complimentary event pass. For panel discussions, all panelists will receive a complimentary event pass. TECHNICAL TALKS A good technical talk should not just report on what has happened over the last year; it should present a concrete problem and how it impacts the user and/or developer community. Whenever applicable, focus on work that needs to be done, difficulties that haven't yet been solved, and on decisions that other developers should be aware of. Summarizing recent developments is okay but it should not be more than a small portion of the overall talk. END-USER TALKS One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user talk. As an end user, this is a unique opportunity to get your input to developers. HANDS-ON / BOF SESSIONS We will reserve some time for people to get together and discuss strategic decisions as well as other topics that are best solved within smaller groups. These sessions will be announced during the event. If you are interested in organizing such a session, please add it to the list at http://www.linux-kvm.org/page/KVM_Forum_2019_BOF Let people you think who might be interested know about your BOF, and encourage them to add their names to the wiki page as well. Please add your ideas to the list before KVM Forum starts. PANEL DISCUSSIONS If you are proposing a panel discussion, please make sure that you list all of your potential panelists in your the abstract. We will request full biographies if a panel is accepted. ============== HOTEL / TRAVEL ============== This year's event will take place at the Lyon Conference Center. For information on hotels close to the conference, please visit https://events.linuxfoundation.org/events/kvm-forum-2019/attend/venue-trave…. Information on conference hotel blocks will be available later in Spring 2019. ================= DATES TO REMEMBER ================= Submission deadline: Saturday, June 15 at 23:59 PST Notification: Monday, August 12 Schedule announced: Friday, August 16 Slides due date: Wednesday, October 23 Event dates: Wednesday, October 30 - Friday, November 1 Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2019 in October! -your KVM Forum 2019 Program Committee Please contact us with any questions or comments at kvm-forum-2019-pc(a)redhat.com

1 year, 5 months

Possible security issue or intended functionality?

by k4m1

Hi, I noticed, that both bootloader - and kernel code are able to make BIOS ROM section writable again. This allows hostile code to make modifications to ROM contents, and then run the modified code. This may allow malicious code to gain privilege escalation from ring0 to ring -2 if I have not misunderstood this. Care to verify wheter this is an issue or not? - k4m1

1 year, 6 months

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS April 2019