Message ID | 20230131063928.388035-4-ajd@linux.ibm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2592858wrn; Mon, 30 Jan 2023 22:41:18 -0800 (PST) X-Google-Smtp-Source: AK7set+dScRPV27arB3CR26WVhUigUGbRBvdRfcQPlyJ75PRzQnuV86eKi8hLxUgDKzV8sg7sqy5 X-Received: by 2002:a05:6a21:6da8:b0:bc:c456:962b with SMTP id wl40-20020a056a216da800b000bcc456962bmr10752923pzb.14.1675147277921; Mon, 30 Jan 2023 22:41:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675147277; cv=none; d=google.com; s=arc-20160816; b=IGy6F0aLC/cJJmQfh0CV/XivFjEJDfO/xwDDuDhvyytNKwt0tNFnanpnPuLhYCmzW6 qLLc0NETzSlzumBd4XM5KLMVGhdD6jH+Jol9zYh+GMxosPMv+qETiP29NiPh27XdfXZs MmnqLmp7e24auxO9rBI9zQUYb4kutJ+TcXSjIU6FF2oIOjk2JLnfCrMNL+Mcez2K4Y5a 5Vy4JvaX0NRDn5zQA3TFPFyZOLOVmlynAvAwGIUYwjEjp8WqlFoypVW0EBz6y7adHNna Jdc5OO3No0z6sesVrMwgXLuiiHb22/zPMNUZRpkjajxLpMLtgEDPEha38SzUOzg/JrJz 7d0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dEnP/mIUlLWHaGiuzYJnd4UvAkzceD7NMcweM9Pm6b0=; b=hnFBgioDmnKUXBchlOM5MBtPbf9ydmSglh6COjE+nYzMwgN6r68BahVAEuEWMQGU8l XPpCxhKjgKnpwWiKgJB2c8SEqIZhCZIM9ixBGUG7eeWiY66t+0XTR4RfWXOeE8veCJds c1L9kSC+Bay8M+0ehpv5I4D1uB8H4xV4dTuk1H/KAsi2YmPyvu0h97yFZ0RtIVjQEtJQ cqCz/8zEaQi8UvjEnMTYtc2hWqlV3QKI2Nky6Lgt7CFQQmtPyQSyXMHrKnF81NowGUhB 7Gv0evHAfidLWU6NJqUjLiE+F/UXLZuY1BMhJ0hhcNsb252I83/G/9rlxU2+3IqSLOu0 62yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="Ejt/GsLa"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l19-20020a170902f69300b0019481337656si17603862plg.0.2023.01.30.22.41.03; Mon, 30 Jan 2023 22:41:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="Ejt/GsLa"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230202AbjAaGkY (ORCPT <rfc822;maxin.john@gmail.com> + 99 others); Tue, 31 Jan 2023 01:40:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbjAaGkX (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 31 Jan 2023 01:40:23 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17C143CE31; Mon, 30 Jan 2023 22:40:22 -0800 (PST) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30V6EFNG003372; Tue, 31 Jan 2023 06:40:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=dEnP/mIUlLWHaGiuzYJnd4UvAkzceD7NMcweM9Pm6b0=; b=Ejt/GsLay3qkjdaX2byPCMv4o//G96lxdNCDJ0SSs5diEHwbpfRkSIgKG/msejDffD5E IBBLxTQwChb8DrurqeX5zOwV+ar+5PNBNf0Ha/cA5OoFO+UdrH5ZvrdEHjfbyVmW6ZBB gUooM8wypJOK+VYYIsBTPg9daPye/pDAfI8p8nAVmO6S40n9Ncp/9wsCWtdOetYNu+Ww QCUzqqIV80nVMOJ+NVITmHTNdXVyV3oT6t6B9OAV6Z1Zv+JOk5PQ8B9VihIJINZfbbwK Be6tOvdU6L/hYCKYxT21hDpfjsNUZggDGsT6GV0R+gj/xdYoYWYSSj7t9fuUosIvAUMQ VQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3newhm0fq5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Jan 2023 06:40:11 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 30V6aOSk029059; Tue, 31 Jan 2023 06:40:11 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3newhm0fp1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Jan 2023 06:40:11 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 30UL30kh014675; Tue, 31 Jan 2023 06:40:09 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3ncvttu3ne-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Jan 2023 06:40:08 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 30V6e6Si43385118 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Jan 2023 06:40:06 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7795F2004F; Tue, 31 Jan 2023 06:40:06 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EBF1820043; Tue, 31 Jan 2023 06:40:05 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 31 Jan 2023 06:40:05 +0000 (GMT) Received: from jarvis-ozlabs-ibm-com.au.ibm.com (unknown [9.192.255.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 04A2D6063C; Tue, 31 Jan 2023 17:40:04 +1100 (AEDT) From: Andrew Donnellan <ajd@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org, linux-integrity@vger.kernel.org Cc: ruscur@russell.cc, bgray@linux.ibm.com, nayna@linux.ibm.com, gcwilson@linux.ibm.com, gjoyce@linux.ibm.com, brking@linux.ibm.com, stefanb@linux.ibm.com, sudhakar@linux.ibm.com, erichte@linux.ibm.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, zohar@linux.ibm.com, joel@jms.id.au, npiggin@gmail.com Subject: [PATCH v5 03/25] powerpc/secvar: Fix incorrect return in secvar_sysfs_load() Date: Tue, 31 Jan 2023 17:39:06 +1100 Message-Id: <20230131063928.388035-4-ajd@linux.ibm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131063928.388035-1-ajd@linux.ibm.com> References: <20230131063928.388035-1-ajd@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: MPODgCbLFFm7ESFDzef4fenXc_5P2lxz X-Proofpoint-GUID: s9pGWRVy13r6jyPglb_1xDOkVV1bldof X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-31_02,2023-01-30_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 bulkscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301310059 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756519232499171026?= X-GMAIL-MSGID: =?utf-8?q?1756519232499171026?= |
Series |
pSeries dynamic secure boot secvar interface + platform keyring loading
|
|
Commit Message
Andrew Donnellan
Jan. 31, 2023, 6:39 a.m. UTC
From: Russell Currey <ruscur@russell.cc> secvar_ops->get_next() returns -ENOENT when there are no more variables to return, which is expected behaviour. Fix this by returning 0 if get_next() returns -ENOENT. This fixes an issue introduced in commit bd5d9c743d38 ("powerpc: expose secure variables to userspace via sysfs"), but the return code of secvar_sysfs_load() was never checked so this issue never mattered. Signed-off-by: Russell Currey <ruscur@russell.cc> Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> --- v5: New patch --- arch/powerpc/kernel/secvar-sysfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Comments
On 1/31/23 01:39, Andrew Donnellan wrote: > From: Russell Currey <ruscur@russell.cc> > > secvar_ops->get_next() returns -ENOENT when there are no more variables > to return, which is expected behaviour. > > Fix this by returning 0 if get_next() returns -ENOENT. > > This fixes an issue introduced in commit bd5d9c743d38 ("powerpc: expose > secure variables to userspace via sysfs"), but the return code of > secvar_sysfs_load() was never checked so this issue never mattered. > > Signed-off-by: Russell Currey <ruscur@russell.cc> > Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> > > --- > > v5: New patch > --- > arch/powerpc/kernel/secvar-sysfs.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c > index 1ee4640a2641..7fa5f8ed9542 100644 > --- a/arch/powerpc/kernel/secvar-sysfs.c > +++ b/arch/powerpc/kernel/secvar-sysfs.c > @@ -179,8 +179,10 @@ static int secvar_sysfs_load(void) > rc = secvar_ops->get_next(name, &namesize, NAME_MAX_SIZE); > if (rc) { > if (rc != -ENOENT) > - pr_err("error getting secvar from firmware %d\n", > - rc); > + pr_err("error getting secvar from firmware %d\n", rc); > + else > + rc = 0; > + > break; > } > Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c index 1ee4640a2641..7fa5f8ed9542 100644 --- a/arch/powerpc/kernel/secvar-sysfs.c +++ b/arch/powerpc/kernel/secvar-sysfs.c @@ -179,8 +179,10 @@ static int secvar_sysfs_load(void) rc = secvar_ops->get_next(name, &namesize, NAME_MAX_SIZE); if (rc) { if (rc != -ENOENT) - pr_err("error getting secvar from firmware %d\n", - rc); + pr_err("error getting secvar from firmware %d\n", rc); + else + rc = 0; + break; }