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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3111C38159 for ; Thu, 19 Jan 2023 01:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230125AbjASBYE (ORCPT ); Wed, 18 Jan 2023 20:24:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230143AbjASBWC (ORCPT ); Wed, 18 Jan 2023 20:22:02 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 967566D36E; Wed, 18 Jan 2023 17:17:56 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id g205so341032pfb.6; Wed, 18 Jan 2023 17:17:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=4qvSylj76pkjJK0liJzUPIoE16nX8cS6scNFJeg8uss=; b=O5M4vcD4Xd6NlKslWlR4eDnUdGeq4ovEo0+vMwvb8XIHogfL5rfP//GQVWFgt0mgPc XwQMTdggmDrbYWl8JeTk/1F6Mi6UqPGZnNI3rntnGaCNPozvnQtZ4HlkUiFERuAQuI63 Gb5gS6Wl2ASjTAG78Ihvrr68wo6jDgXUXcSsdvVQV1N7F3lXMOU05hhGJqBGGocXOeGj 5ohvftx7sulbxTkM7Mn3JYO5SqNFn828fTp1wgY9F4fin1E710xq6p1fPpgc3HvJQYv6 TZ7AQPl5H+nEV/KsWXOx3eeMDME++GtVAyJ0Ra/ns1LPxdxnxQvsFOnBW+Cvdbj5Fdve 1D+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=4qvSylj76pkjJK0liJzUPIoE16nX8cS6scNFJeg8uss=; b=Ha+JKSZjuCN/UbP/1WbY8FOa30B7fJGiWajOJUD05kqAVwPgkjIOn00gwwgndS9igq jB597YToGGHgSa13SXX8aLGUkYYk7e08aVgfRc+5YDx1j7y777cVMxZibf7wRbXphBBo Bfi+/0bN6vcy3hTa69IPJWhYiVPBdHn8PcjoU192+0Gz+4TBaxtNTmv5c8AJjJJ0bHZl J/jGuiYyEcDTKW6ksSoNFnwAX4Mq6oGTmpM/757Xr84eeyk/iztoxe6EV5CxRpzQnIBk bg7iFiCe5tAyeIF+BtGuWSKm4yYLCWtANvl/9EXrEy/zgTPFqqMvVFsOIlV2ORNGAIKg A7ew== X-Gm-Message-State: AFqh2krsLcY6W90VL9IY1o7B0OApAnSquKOKfzMNmeakSkcV1nqiDudJ 2ApbQyxbyjca6/PRHbWwt2E= X-Google-Smtp-Source: AMrXdXvuftfAEVkHFKNo/wDV5xp7EjIbGUCEj2qZ0VaidNV7nooG4/Xwhn7ZX3U38U3XBhaAHwkioA== X-Received: by 2002:aa7:9399:0:b0:58d:272a:52a0 with SMTP id t25-20020aa79399000000b0058d272a52a0mr8120300pfe.32.1674091076111; Wed, 18 Jan 2023 17:17:56 -0800 (PST) Received: from localhost (193-116-102-45.tpgi.com.au. [193.116.102.45]) by smtp.gmail.com with ESMTPSA id f24-20020aa79698000000b0058bc60dd98dsm8788019pfk.23.2023.01.18.17.17.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jan 2023 17:17:55 -0800 (PST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Thu, 19 Jan 2023 11:17:49 +1000 Message-Id: Cc: , , , , , , , , Subject: Re: [PATCH v3 04/24] powerpc/secvar: Handle format string in the consumer From: "Nicholas Piggin" To: "Andrew Donnellan" , , X-Mailer: aerc 0.13.0 References: <20230118061049.1006141-1-ajd@linux.ibm.com> <20230118061049.1006141-5-ajd@linux.ibm.com> In-Reply-To: <20230118061049.1006141-5-ajd@linux.ibm.com> Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Wed Jan 18, 2023 at 4:10 PM AEST, Andrew Donnellan wrote: > From: Russell Currey > > The code that handles the format string in secvar-sysfs.c is entirely > OPAL specific, so create a new "format" op in secvar_operations to make > the secvar code more generic. No functional change. > > Signed-off-by: Russell Currey > Signed-off-by: Andrew Donnellan > > --- > > v2: Use sysfs_emit() instead of sprintf() (gregkh) > > v3: Enforce format string size limit (ruscur) > --- > arch/powerpc/include/asm/secvar.h | 3 +++ > arch/powerpc/kernel/secvar-sysfs.c | 23 ++++-------------- > arch/powerpc/platforms/powernv/opal-secvar.c | 25 ++++++++++++++++++++ > 3 files changed, 33 insertions(+), 18 deletions(-) > > diff --git a/arch/powerpc/include/asm/secvar.h b/arch/powerpc/include/asm= /secvar.h > index 07ba36f868a7..8b6475589120 100644 > --- a/arch/powerpc/include/asm/secvar.h > +++ b/arch/powerpc/include/asm/secvar.h > @@ -11,12 +11,15 @@ > #include > #include > =20 > +#define SECVAR_MAX_FORMAT_LEN 30 // max length of string returned by ->f= ormat() > + > extern const struct secvar_operations *secvar_ops; > =20 > struct secvar_operations { > int (*get)(const char *key, u64 key_len, u8 *data, u64 *data_size); > int (*get_next)(const char *key, u64 *key_len, u64 keybufsize); > int (*set)(const char *key, u64 key_len, u8 *data, u64 data_size); > + ssize_t (*format)(char *buf); > }; > =20 > #ifdef CONFIG_PPC_SECURE_BOOT > diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/sec= var-sysfs.c > index 462cacc0ca60..d3858eedd72c 100644 > --- a/arch/powerpc/kernel/secvar-sysfs.c > +++ b/arch/powerpc/kernel/secvar-sysfs.c > @@ -21,26 +21,13 @@ static struct kset *secvar_kset; > static ssize_t format_show(struct kobject *kobj, struct kobj_attribute *= attr, > char *buf) > { > - ssize_t rc =3D 0; > - struct device_node *node; > - const char *format; > - > - node =3D of_find_compatible_node(NULL, NULL, "ibm,secvar-backend"); > - if (!of_device_is_available(node)) { > - rc =3D -ENODEV; > - goto out; > - } > + char tmp[SECVAR_MAX_FORMAT_LEN]; > + ssize_t len =3D secvar_ops->format(tmp); > =20 > - rc =3D of_property_read_string(node, "format", &format); > - if (rc) > - goto out; > + if (len <=3D 0) > + return -EIO; AFAIKS this does have a functional change, it loses the return value. Why not return len if it is < 0, and -EIO if len =3D=3D 0? Thanks, Nick