From patchwork Wed Jul 4 15:49:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10507283 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E9D50601D7 for ; Wed, 4 Jul 2018 15:49:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6A5E28884 for ; Wed, 4 Jul 2018 15:49:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA5A3288BE; Wed, 4 Jul 2018 15:49:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5B3D28884 for ; Wed, 4 Jul 2018 15:49:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752622AbeGDPt0 (ORCPT ); Wed, 4 Jul 2018 11:49:26 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:35485 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752406AbeGDPtZ (ORCPT ); Wed, 4 Jul 2018 11:49:25 -0400 Received: by mail-ed1-f66.google.com with SMTP id b10-v6so4361461edi.2 for ; Wed, 04 Jul 2018 08:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nh3Vqe3ZbN0PBJNN8uz18IspA2Go6Mdwe33u4rdyQo4=; b=gtZ0OV3Bg3X8hXrvxiqXjeyI1KC6wCL0uCwLajP90sEt+yu5EIAqC2moRqQvjJGOXg VSj94hcE/6VSFP2HP2bYM4wD6SM7wOaHgMYe+DR8F1MCGHKnJodRas2o2c2z0+chQdv4 KskP3ncD096JlyANaE5/nQr0Trddno8DuGqV0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nh3Vqe3ZbN0PBJNN8uz18IspA2Go6Mdwe33u4rdyQo4=; b=phHpNrfv8AjrIAN+d7SDQ0mQ5zMFM0thjOyaSk/JD24kE+nhee6r6WEcLRCWOqfRWj OReEHl6Wm4ler4Of7osXyWnyu8xJQnLOixsQCFPmwL8t4/WwvKWR+w1nQCOVuo4ZUbpd SQsnI1jJaSLfjRFnpyRdCf1rGXBP30w/gptGC1QQo2wtEVj9MEkLTCl67s5CZDTHrWOZ g6yNE8AEOq3jFRmLz3ZNi/a3xrkrdFGfy27hxi/HzYbPim3fOItY76DD1tmYTeTj2/WC cXRab+wZuXqcULOCZ5qwDGcx75zys6JAcJtHRLhxx58QJmOfXzzPg47nfDpGopgKxci8 xMvQ== X-Gm-Message-State: APt69E0BJU77L4te1K49VPtFKkNoSoK8VzGSWvTpg8C3YmR/fKTWLljw Bx518Ue3d1nQ0Qi6qAz8cQzHmw== X-Google-Smtp-Source: AAOMgpdgAljrqJpDDdS8UshJPRMjBI9K8u1cjim0GyCxTp0udPAxS6diO/fllkhk6ORX5B2pmUoJgQ== X-Received: by 2002:aa7:d9d7:: with SMTP id v23-v6mr3301784eds.300.1530719364312; Wed, 04 Jul 2018 08:49:24 -0700 (PDT) Received: from ards-mac-mini.arnhem.chello.nl (dhcp-077-251-017-237.chello.nl. [77.251.17.237]) by smtp.gmail.com with ESMTPSA id l61-v6sm1966954edl.96.2018.07.04.08.49.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jul 2018 08:49:23 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-acpi@vger.kernel.org, leif.lindholm@linaro.org, mark.rutland@arm.com, will.deacon@arm.com, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Mark Salter , Geoff Levand , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Riku Voipio , James Morse , Ian Campbell Subject: [RFC PATCH 1/2] efi/libstub: refactor load option command line processing for reuse Date: Wed, 4 Jul 2018 17:49:18 +0200 Message-Id: <20180704154919.18564-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180704154919.18564-1-ard.biesheuvel@linaro.org> References: <20180704154919.18564-1-ard.biesheuvel@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As a preparatory step towards adding support for extra kernel command line arguments passed via a UEFI variable, do a slight refactor of the existing code so we can extend it more cleanly in a subsequent patch. No change is functionality is intended. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/efi-stub-helper.c | 43 ++++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c index 50a9cab5a834..97a2423782af 100644 --- a/drivers/firmware/efi/libstub/efi-stub-helper.c +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c @@ -726,6 +726,22 @@ static int efi_utf8_bytes(u16 c) return 1 + (c >= 0x80) + (c >= 0x800); } +/* + * Get an upper bound for the number of UTF-8 bytes corresponding + * to a \n or \0 terminated UTF-16 string. + */ +static int count_utf8_bytes(const u16 *s, int max_chars, int *num_chars) +{ + int ret = 0; + + while (*s != '\0' && *s != '\n' && --max_chars >= 0) { + ret += efi_utf8_bytes(*s++); + ++*num_chars; + } + + return ret; +} + /* * Convert an UTF-16 string, not necessarily null terminated, to UTF-8. */ @@ -779,44 +795,35 @@ char *efi_convert_cmdline(efi_system_table_t *sys_table_arg, efi_loaded_image_t *image, int *cmd_line_len) { - const u16 *s2; - u8 *s1 = NULL; + u8 *s1; unsigned long cmdline_addr = 0; int load_options_chars = image->load_options_size / 2; /* UTF-16 */ const u16 *options = image->load_options; - int options_bytes = 0; /* UTF-8 bytes */ + int cmd_line_bytes = 0; /* UTF-8 bytes */ int options_chars = 0; /* UTF-16 chars */ efi_status_t status; u16 zero = 0; - if (options) { - s2 = options; - while (*s2 && *s2 != '\n' - && options_chars < load_options_chars) { - options_bytes += efi_utf8_bytes(*s2++); - options_chars++; - } - } + if (options) + cmd_line_bytes = count_utf8_bytes(options, load_options_chars, + &options_chars); if (!options_chars) { /* No command line options, so return empty string*/ options = &zero; } - options_bytes++; /* NUL termination */ + cmd_line_bytes++; /* NUL termination */ - status = efi_high_alloc(sys_table_arg, options_bytes, 0, + status = efi_high_alloc(sys_table_arg, cmd_line_bytes, 0, &cmdline_addr, MAX_CMDLINE_ADDRESS); if (status != EFI_SUCCESS) return NULL; - s1 = (u8 *)cmdline_addr; - s2 = (const u16 *)options; - - s1 = efi_utf16_to_utf8(s1, s2, options_chars); + s1 = efi_utf16_to_utf8((u8 *)cmdline_addr, options, options_chars); *s1 = '\0'; - *cmd_line_len = options_bytes; + *cmd_line_len = cmd_line_bytes; return (char *)cmdline_addr; }