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: 141074 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp951305ljj; Wed, 4 Jul 2018 08:49:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdfXcc8L2uK4qtYI2RzNgpXfpFvud1PuRKTaNg/yIl4MpppFQ8yT6QlOjIfqOm3zcNswubN X-Received: by 2002:a62:c991:: with SMTP id l17-v6mr2746521pfk.10.1530719367519; Wed, 04 Jul 2018 08:49:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530719367; cv=none; d=google.com; s=arc-20160816; b=OFmOuuD7mKSJh/yusihYKUjo3kcTsTXkROj8I5Vb8SbXTe2LkvovcVNsL2oyVPX7z+ FnuKGK4cDcMBLVYrsdxP0Rpx0tFrNaeDRDaOYDMcNJC06doqJWkMP1m1VWFhhZ/iigdc deBgiqQNjZ7nanzbSXWT5pKhzpaUUUmwmzkX+6TxaSB0hOYkLDANDEtXF+SD5ilxILDI RgkoRUeLnPdMdQcVoJ+GQhoPAMozgFuh8Adf177ujEGGxRDVtVpbLnikxUhGICl4DoCf ZWW9nVq2+onc+fLyE7rg64/BttFRsLcmh7Iyyucndye1sWgZltPJkP4XGPxvkpuImhn3 ipnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=tMBaRrzWcmcS/JmS5cBs9+4NhsDirAEl/HfvmdDQLpY=; b=M9aaVyT7F7812TTk8WO7g44VdMXRSY5BnQi1QA2cVYgdI38mj/ofdwIxMeBcFvuNgE I0Z/Ay9Jf4e0etvNel/Htdjp4Qp6HZTCW+7kpqvRMmu2QLokSpCj08iLW5HSbY9l4I+x Jm94d8ZANF12IxlpgpLzaq5LcVG1rufYv0Jk4J9+XTYNGXLK8Oisv0i+/UbylI/U5UbJ FguLf6w9rklkEVIgUNcXyScP1p6ZxujT65ic2rX+rahX2j3Br9HYEeFzOjPopo+tUpyt WJWKiPw9CV3fjmsxoMjDP5/8X5v98YC96ev8rqeV5pr6qxIjMQq8bL/m/A8xjG5XSMGK sAkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gtZ0OV3B; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 34-v6si3746846plz.479.2018.07.04.08.49.27; Wed, 04 Jul 2018 08:49:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gtZ0OV3B; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571AbeGDPt0 (ORCPT + 3 others); Wed, 4 Jul 2018 11:49:26 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:44276 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752173AbeGDPtZ (ORCPT ); Wed, 4 Jul 2018 11:49:25 -0400 Received: by mail-ed1-f65.google.com with SMTP id f12-v6so4351205edq.11 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=Y4x+Ua46G0Ku/UF1KoXEDPxnCZb/cZEJQnoFAQUBw4tWXL/C/lVgqhfMN0Pd2SEjso PnStTYty0qzyyT9F+ERDTrsZTshQC1lc1Y9lVA7GEXfY148Gn7SOhbyPodLNjr83+O47 k+v5itqFQR24HS0E0MiFxmlRSJo8B69NP6Jv0bVqsW7am9PGWf0O+2tUomhyrB1Q77+8 PgkCQ7GNtLuepfgLa53Odxn9kCfVnLIPWiqyW5fPn/3K1+0lcguXx8f01GSo/nIv8wZx J6+VSGSvJBxyh8bzSDIkyymZXIgIKK2VaNaz1h6BJUkXNiyPRVrxZWwm/skvFw5XqB80 mgWQ== X-Gm-Message-State: APt69E2kERSYbCLmeOGqWxkizR8ayz87AYnChjebvvmrTt0zgmxiwsc0 NoVRN6wD/5TOJ4D8N8lq1cvQEYAsKVE= 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-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org 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(-) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }