From mboxrd@z Thu Jan 1 00:00:00 1970 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 A82C9C4167B for ; Wed, 29 Nov 2023 11:19:35 +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=Yl7x/AHEQD42geOVeEJVUIbqAKtUZU/QpKQmtIwC9PU=; b=4mZZ6Vwyr3AmPcMdi8KfLJ5Ix7 X4Ablql4ckO5KLT6SbqlcQkxtQu5L8PHyCfN8ARh5GZcBp/9RBKMYSPMtl8YBWidtCl6xcox0GM7G FtWiOh/cDN5sXROWE1NjeAAftkvR+vJsUFRd+HsSlF94q+kWT9+UVdYnad9rjdZGLu2k9yvGHnn0B 1bNADv75qUetLw9OZfYonkZ99NxFNRTh+txzVvFmkROT8iKMK2nSm9mclpY+7fvp3pSDCx1xL6i31 br71ZVbo2zFGSJEgswPlT1XYyay0Q/1t+5VpLR1VyPfD0IRw7vESgzJp2W8cAB4yuMo+NyzieGTJR QJjN3Xtg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8Ias-0080PP-06; Wed, 29 Nov 2023 11:19:02 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IaH-007zrr-2e for linux-arm-kernel@bombadil.infradead.org; Wed, 29 Nov 2023 11:18:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=RmLIZerTuL5aXXwlG/jBVf22QTI/K1/D9+NAVO0D17k=; b=AcMqpfN3SWS7sUjXx4cQ0lGgbh wNWDaeMEjM6ePlVct9u8Oj7hFJTgMnDUVfy4P9J23KP5nsTrP0Iz5EXMoSb0/BFJpGnhKP+UZnuA5 9MXTnqLhpyfa64I5CoJQzoLBNGOCns9vzsHapRTKxbdBCkk0v4p2ZA4nf2F2T2jiM1yFAYIb7j6nm EIoM0RPNVOVbTU2NXDzO6Wnu5TYvi+irFSl2GURcx4PKre4UVSwMq/8tgFdK65tKGlEDKMEAi4M+h h/YhgtETZYGeW3JO8UnQBhLNd3y2kGBEBDXRkfHitaMcZEgta79qJxk5gmQ7LVbTWFFSaTqPScad0 JnEjJNRA==; Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IZz-000KAQ-36 for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:18:19 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-333120f8976so1032915f8f.3 for ; Wed, 29 Nov 2023 03:18:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256679; x=1701861479; 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=RmLIZerTuL5aXXwlG/jBVf22QTI/K1/D9+NAVO0D17k=; b=2v7+7TZajhtHYgzNDm9S6ybGl/npHU4tbhaQax+cg6j5CFyQ0+YpzfxbnlIamb25iM Uubu+W3CMzubRe36VUD3CpZEn63e+R6qI/1b3a6E3QRSiA25mcUf/h3c46MIm8UdZ3e3 luq9R3Xd+v9M6WLGXmqpMYmmPO+RWPXfPAdCFeT4DEl/BGPOQ/Jx/0apAxyeVf3VdDGp o4L9pBS/Rg0+SAWFBrIOi/5pR0dGBigjsydjFo7YjeVbk0E/JaKtFJiivkUKC3alBBqA IIqT3/1M9c4OsKXXX9kjJ4V7IXKqhirKlIB8J3FXsh2YCPLSwPq6S2rh58oE7m0rtofb ys6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256679; x=1701861479; 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=RmLIZerTuL5aXXwlG/jBVf22QTI/K1/D9+NAVO0D17k=; b=uyWf3h3aU3z6lOcJfmk1V8L62VI2UDmUNEdDdciA+nr5Q/62+MBq59OlB4WdCypSSR rrHvJR4F2nWTo4ch0Mn/O2OBzMNnuRMje8/TujFpWQK70EPTV6akGY9exsytHX7vrm// RSL7z230uNxWa2tLTlHXkxhcSnT2X9SqZP9b5X74RJL0HgbYTn9uxqcATwiLpPUgUEtm OV5Fh+p9cqbvTV/TbVIYAXyY17yFCVwhP1Cd3ofR+l7sEVrGa+Ocp0okXIUPKd8bG7wQ nu76fPfxJswOk+gGrjF0/06jdG6hXk36xVdWqIMotTKoWW8V1lek+T/EIzt23hZW5Ti0 Ffug== X-Gm-Message-State: AOJu0YyKSeGc2STrLWcNZNnzTEt1WBNiSE7ySi8xwVZK0Bez7M+/bcsJ QHQkRMb7dgDwL05WyvEE7yY2lDlb/t3HbvoxRn39IafYOLH+2S+7nL5mZc8fJgoEFM/HUrnPTuB c5mUdxmHqenwg+tjpWcYGDUImpI0P7YPbZfjpqbhI2mXvjRAvWXH0WR9EpPzU7bogOhFZlFTcmN M= X-Google-Smtp-Source: AGHT+IHdp7krExxhevhzsYmBIsR3mC4m7On7uwkghPQfYEoAJSnNJTq+X0ksYH9bnS8EQEhJVL2zUAoV X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a5d:5f4c:0:b0:333:3d3:79e3 with SMTP id cm12-20020a5d5f4c000000b0033303d379e3mr132289wrb.5.1701256679021; Wed, 29 Nov 2023 03:17:59 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:15 +0100 In-Reply-To: <20231129111555.3594833-43-ardb@google.com> Mime-Version: 1.0 References: <20231129111555.3594833-43-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=Ah5RsfHb2Ttu6R+Nsjt6q1tqbyVzAfe7bh7s5pxYXcQ=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdtpEl2q1mesI/vm9zFeLuBHUu/XUweFokc7eYyZ2ex xeX3DjeUcrCIMbBICumyCIw+++7nacnStU6z5KFmcPKBDKEgYtTACYiN53hrzTPtf0uC9p2NnpX rFN4VL2npuTVx3k7Np6S8a0Um/7wRSwjw6clCmd3H9e+WrZ3f7VUcbxI3f5DU/RL7i+u0lEI+HC BhwkA X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-62-ardb@google.com> Subject: [PATCH v6 19/41] 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-20231129_111815_457466_F8F11B62 X-CRM114-Status: GOOD ( 15.50 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 cf1df5f6fbc1..9646f94094ed 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -206,6 +206,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) { @@ -219,7 +233,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) -- 2.43.0.rc1.413.gea7ed67945-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel