From patchwork Wed Aug 16 12:51:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9903643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7AC5A6038C for ; Wed, 16 Aug 2017 12:54:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CF68289CD for ; Wed, 16 Aug 2017 12:54:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6216C289E2; Wed, 16 Aug 2017 12:54:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 16135289CD for ; Wed, 16 Aug 2017 12:54:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoG-0008P1-FN; Wed, 16 Aug 2017 12:52:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoF-0008LK-8E for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:31 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 96/61-01995-E0044995; Wed, 16 Aug 2017 12:52:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ovy6vw5R Ig4N/zS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozOzkXsBe28FVs/bGFvYFzE2cXIySEhYCTx duI/pi5GLg4hgWOMEhMuLmUFSbAJqEpsuH4KzBYRUJK4t2oyE4jNLOAq0fAbokZYIFniSPMxs DgLUP2P3n1gcV4BE4kbq+awQCyQl+g4MBnM5gSKT95wDMwWEjCW2N7TyD6BkXsBI8MqRo3i1K Ky1CJdQ0u9pKLM9IyS3MTMHF1DA2O93NTi4sT01JzEpGK95PzcTYxA/9YzMDDuYPx93O8QoyQ Hk5Iob5DWlEghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKEryL7IBygkWp6akVaZk5wECDSUtw8CiJ 8KbZAqV5iwsSc4sz0yFSpxh1OV5N+P+NSYglLz8vVUqcNxNkhgBIUUZpHtwIWNBfYpSVEuZlZ GBgEOIpSC3KzSxBlX/FKM7BqCTMK2EPNIUnM68EbtMroCOYgI640j4J5IiSRISUVANjAaeFIf 8qqxrBdeXyQvH72jrv1nrPL9WMtW05ms+1OeLBmcCMFaFbBCSWXMnpntFe55AUctfBx7xM5Mg pDv+1uf72AjOY58ocXN+wVSKbfdqnw9/W8+g2aV2wKg5Ome+je+hi+cf9BhmLH7teecQlzpEe WcTuL7u81iig98exO89MGq/HMimxFGckGmoxFxUnAgAEjrzrdQIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1502887949!110102412!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64654 invoked from network); 16 Aug 2017 12:52:29 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-14.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:29 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 88EA9AE71 for ; Wed, 16 Aug 2017 12:52:29 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:51:52 +0200 Message-Id: <20170816125219.5255-26-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170816125219.5255-1-jgross@suse.com> References: <20170816125219.5255-1-jgross@suse.com> Cc: Juergen Gross , Jan Beulich Subject: [Xen-devel] [PATCH v3 25/52] xen/common/efi/boot.c: let custom parameter parsing routines return errno X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Modify the custom parameter parsing routines in: xen/common/efi/boot.c to indicate whether the parameter value was parsed successfully. Cc: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- V3: - dont return out of loops (Jan Beulich) - dont modify option value in parsing function --- xen/common/efi/boot.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 11bdc7a2a4..01d33004e0 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1306,9 +1306,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) static bool __initdata efi_map_uc; -static void __init parse_efi_param(char *s) +static int __init parse_efi_param(const char *s) { - char *ss; + const char *ss; + int rc = 0; do { bool val = strncmp(s, "no-", 3); @@ -1317,21 +1318,25 @@ static void __init parse_efi_param(char *s) s += 3; ss = strchr(s, ','); - if ( ss ) - *ss = '\0'; + if ( !ss ) + ss = strchr(s, '\0'); - if ( !strcmp(s, "rs") ) + if ( !strncmp(s, "rs", ss - s) ) { if ( val ) __set_bit(EFI_RS, &efi_flags); else __clear_bit(EFI_RS, &efi_flags); } - else if ( !strcmp(s, "attr=uc") ) + else if ( !strncmp(s, "attr=uc", ss - s) ) efi_map_uc = val; + else + rc = -EINVAL; s = ss + 1; - } while ( ss ); + } while ( *ss ); + + return rc; } custom_param("efi", parse_efi_param);