From patchwork Fri Nov 24 10:18:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13467569 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4134FC636D4 for ; Fri, 24 Nov 2023 11:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=V7dr1lky53nmQ4lnKWgSQ11ZO97NRSJw7hOHfU0PcZQ=; b=a9hokLFYYrZJesFkVSGDvENSkv hpuWFjwUbPafXJ8zPszIhvy3/OX7qeZi6ACHhFx5T78+0IKXmjBZZdbH2T4CVcCz7dvsXJkBmeB9h 09Mm17dGlUcFh6EqmrYX6Wg8+m7qbd9hWLe8LEd0av/AJpCK41DR6+OkWn7g1GhMKWvfP/2UpK9p/ fVkMHRmVrWa6qyNJntCY+K1UOk2VZieRRZUnaE8Q7hURd0/YvYUux9I2eo3ilO5ptYIaSjzl+Vb/w T+70SsNDg5JxUX73zwGGea31nVb9VbW5uyCidU1aXDSFo2xbxf4buhbNkorJc9+grQLgq/QW3uM8W wRKjHfqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6UPW-006yUC-33; Fri, 24 Nov 2023 11:31:50 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIx-006ooG-0G for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:21:01 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-da0ccfc4fc8so2405371276.2 for ; Fri, 24 Nov 2023 02:20:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821257; x=1701426057; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zqx2vN/ooTrKAVWBshy8Ta+sP+wPrsjx5cWvmkNx64E=; b=1ua7YKmb6nKaJP2hy5ovc0rbtzP60QIJZbhWe+zNfD6+/BJpLfHAzmZMcSV+SemsIi XAXnAPV0ZUE1XmXfaBzvLrcjb28OB71ZRj6uOQ1A6qOn0guT+u33CWH/OGpsZcCN5lUb OxfuYRoH20bBLe674/1qowUUUdxzQvG4j8gDfOBaKUp1C7YxTon9hIZDt8hSS7Kd/IGK ui+jzb3L01FRQIrD1tikIEqeYieo7oR10jyTC+jP2JFLlRLMz1BzolOpTzhFxJoAgZO4 G9sfL06dHjelU/KCXjLIsVKnZH8P6OvRnFgVZbAO40MU9ml9VV7p2wnLHRA+QUoOe9ue dSqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821257; x=1701426057; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zqx2vN/ooTrKAVWBshy8Ta+sP+wPrsjx5cWvmkNx64E=; b=OGNupzBUauU8IEfH5BA++064ij1JmNdvC+S9jWH7KcjNgNSjGsxApoQtYtMj5r6TbF HSaOW6PP7QmmwiauKYeMnqJiR+g1wMQFqQl8fklwaQmpSFV2PamLrYse+df1r6kmk+z8 3Qpk0737Pixrr+07rUd/+GodUKxkq9o0EskW5FlGFfdwtQB+mqQEH34nBtWblUYHbyFT dPiTDMfHqiW65fzcCh2przK467K42kcPDGWDX862E5kCyWibRvT4ams9Y1eHv8I4GWUb GaqmMUyvrU8ACx0q38De5dmreFjaF3hlQ8dCTrfW7R9XPF23bf03uQ7QD5HjtOWVdsI5 gTdA== X-Gm-Message-State: AOJu0YxRhjhBjxExUZACl+agayHtjEIXB9YZuqeiEX9n4HIEScl/167J o3NBz4BERrcKAQLU0fjzV14Y8LItHqhJxHbudZnO1zraAKNh8eFK19ihfPfIujXdrvOPnM4cbyn svbULRruxQBOO/whfyd/KpAKlhiVgTG3+Qw0M2Syzpw97QCZ3ShkXRrUI1bon75pxYG77QTA/Z+ M= X-Google-Smtp-Source: AGHT+IHZKgRwMYQZK6nTreuKpHl3uVJzY2b7wu0oTmBeD0TQGhq389hf+I4fEpFwnrqD2OBTMab6QO0E X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:cf14:0:b0:daf:660e:9bdb with SMTP id f20-20020a25cf14000000b00daf660e9bdbmr65973ybg.6.1700821257141; Fri, 24 Nov 2023 02:20:57 -0800 (PST) Date: Fri, 24 Nov 2023 11:18:59 +0100 In-Reply-To: <20231124101840.944737-41-ardb@google.com> Mime-Version: 1.0 References: <20231124101840.944737-41-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1683; i=ardb@kernel.org; h=from:subject; bh=Px7/KCxFjrRFAVEoUqGQ547s7n386NOxqHmoPGXvkvQ=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhYsbkFb050jWLOZNPnKw883c/79m3G41eu0cx10+fb pX8Odmlo5SFQYyDQVZMkUVg9t93O09PlKp1niULM4eVCWQIAxenAExEKYbhn45OT/6OrF1136LC lpg6ey/7JVe1mbntusjK6w9ntISLRTP8U94RLL7QZfqhfuFqXS3OWt2Nvv+Yn87Vf7JpxSGF8Pi t7AA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-60-ardb@google.com> Subject: [PATCH v5 19/39] arm64: idreg-override: Avoid kstrtou64() to parse a single hex digit From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231124_022059_133896_46F028BC X-CRM114-Status: GOOD ( 14.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel All ID register value overrides are =0 with the exception of the nokaslr pseudo feature which uses =1. In order to remove the dependency on kstrtou64(), which is part of the core kernel and no longer usable once we move idreg-override into the early mini C runtime, let's just parse a single hex digit (with optional leading 0x) and set the output value accordingly. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/idreg-override.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index 41eeca857b32..2eb81795934a 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -215,6 +215,20 @@ static int __init parse_nokaslr(char *unused) } early_param("nokaslr", parse_nokaslr); +static int __init parse_hexdigit(const char *p, u64 *v) +{ + // skip "0x" if it comes next + if (p[0] == '0' && tolower(p[1]) == 'x') + p += 2; + + // check whether the RHS is a single hex digit + if (!isxdigit(p[0]) || (p[1] && !isspace(p[1]))) + return -EINVAL; + + *v = tolower(*p) - (isdigit(*p) ? '0' : 'a' - 10); + return 0; +} + static int __init find_field(const char *cmdline, char *opt, int len, const struct ftr_set_desc *reg, int f, u64 *v) { @@ -228,7 +242,7 @@ static int __init find_field(const char *cmdline, char *opt, int len, if (memcmp(cmdline, opt, len)) return -1; - return kstrtou64(cmdline + len, 0, v); + return parse_hexdigit(cmdline + len, v); } static void __init match_options(const char *cmdline)