From nobody Fri May 17 03:39:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1698308340423188.29542959401863; Thu, 26 Oct 2023 01:19:00 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.623570.971530 (Exim 4.92) (envelope-from ) id 1qvvZe-0005Hb-DA; Thu, 26 Oct 2023 08:18:38 +0000 Received: by outflank-mailman (output) from mailman id 623570.971530; Thu, 26 Oct 2023 08:18:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qvvZe-0005HU-AX; Thu, 26 Oct 2023 08:18:38 +0000 Received: by outflank-mailman (input) for mailman id 623570; Thu, 26 Oct 2023 08:18:37 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qvvZc-0004Fi-V0 for xen-devel@lists.xenproject.org; Thu, 26 Oct 2023 08:18:36 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 41be070b-73d8-11ee-9b0e-b553b5be7939; Thu, 26 Oct 2023 10:18:35 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id A80AF4EE0742; Thu, 26 Oct 2023 10:18:32 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 41be070b-73d8-11ee-9b0e-b553b5be7939 From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Nicola Vetrini , Simone Ballarin , Doug Goldstein , George Dunlap , Julien Grall , Wei Liu Subject: [XEN PATCH][for-4.19 v4] xen: Add deviations for MISRA C:2012 Rule 7.1 Date: Thu, 26 Oct 2023 10:18:30 +0200 Message-Id: <9bc37dc81744283ca3b92ce3ffad373740122288.1698308237.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1698308341038100001 Content-Type: text/plain; charset="utf-8" As specified in rules.rst, these constants can be used in the code. Signed-off-by: Nicola Vetrini --- Changes in v2: - replace some SAF deviations with configurations Changes in v3: - refine configurations and justifications Changes in v4: - updated deviation record comment. --- automation/eclair_analysis/ECLAIR/deviations.ecl | 10 ++++++---- docs/misra/deviations.rst | 7 +++++++ docs/misra/safe.json | 8 ++++++++ xen/arch/x86/hvm/svm/emulate.c | 6 +++--- xen/common/inflate.c | 4 ++-- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/= eclair_analysis/ECLAIR/deviations.ecl index fa56e5c00a27..ea5e0eb1813f 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -85,10 +85,12 @@ conform to the directive." # Series 7. # =20 --doc_begin=3D"Usage of the following constants is safe, since they are giv= en as-is -in the inflate algorithm specification and there is therefore no risk of t= hem -being interpreted as decimal constants." --config=3DMC3R1.R7.1,literals=3D{safe, "^0(007|37|070|213|236|300|321|330|= 331|332|333|334|335|337|371)$"} +-doc_begin=3D"It is safe to use certain octal constants the way they are d= efined in +specifications, manuals, and algorithm descriptions." +-file_tag+=3D{x86_svm_h, "^xen/arch/x86/hvm/svm/svm\\.h$"} +-file_tag+=3D{x86_emulate_c, "^xen/arch/x86/hvm/svm/emulate\\.c$"} +-config=3DMC3R1.R7.1,reports+=3D{safe, "any_area(any_loc(any_exp(file(x86_= svm_h)&¯o(^INSTR_ENC$))))"} +-config=3DMC3R1.R7.1,reports+=3D{safe, "any_area(text(^.*octal-ok.*$)&&any= _loc(any_exp(file(x86_emulate_c)&¯o(^MASK_EXTR$))))"} -doc_end =20 -doc_begin=3D"Violations in files that maintainers have asked to not modif= y in the diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 8511a189253b..8aaaa1473fb4 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -90,6 +90,13 @@ Deviations related to MISRA C:2012 Rules: - __emulate_2op and __emulate_2op_nobyte - read_debugreg and write_debugreg =20 + * - R7.1 + - It is safe to use certain octal constants the way they are defined + in specifications, manuals, and algorithm descriptions. Such places + are marked safe with a /\* octal-ok \*/ in-code comment, or with a = SAF + comment (see safe.json). + - Tagged as `safe` for ECLAIR. + * - R7.2 - Violations caused by __HYPERVISOR_VIRT_START are related to the particular use of it done in xen_mk_ulong. diff --git a/docs/misra/safe.json b/docs/misra/safe.json index 39c5c056c7d4..7ea47344ffcc 100644 --- a/docs/misra/safe.json +++ b/docs/misra/safe.json @@ -20,6 +20,14 @@ }, { "id": "SAF-2-safe", + "analyser": { + "eclair": "MC3R1.R7.1" + }, + "name": "Rule 7.1: constants defined in specifications, manual= s, and algorithm descriptions", + "text": "It is safe to use certain octal constants the way the= y are defined in specifications, manuals, and algorithm descriptions." + }, + { + "id": "SAF-3-safe", "analyser": {}, "name": "Sentinel", "text": "Next ID to be used" diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c index aa2c61c433b3..93ac1d3435f9 100644 --- a/xen/arch/x86/hvm/svm/emulate.c +++ b/xen/arch/x86/hvm/svm/emulate.c @@ -90,9 +90,9 @@ unsigned int svm_get_insn_len(struct vcpu *v, unsigned in= t instr_enc) if ( !instr_modrm ) return emul_len; =20 - if ( modrm_mod =3D=3D MASK_EXTR(instr_modrm, 0300) && - (modrm_reg & 7) =3D=3D MASK_EXTR(instr_modrm, 0070) && - (modrm_rm & 7) =3D=3D MASK_EXTR(instr_modrm, 0007) ) + if ( modrm_mod =3D=3D MASK_EXTR(instr_modrm, 0300) && /* oct= al-ok */ + (modrm_reg & 7) =3D=3D MASK_EXTR(instr_modrm, 0070) && /* oct= al-ok */ + (modrm_rm & 7) =3D=3D MASK_EXTR(instr_modrm, 0007) ) /* oct= al-ok */ return emul_len; } =20 diff --git a/xen/common/inflate.c b/xen/common/inflate.c index 8fa4b96d12a3..be6a9115187e 100644 --- a/xen/common/inflate.c +++ b/xen/common/inflate.c @@ -1201,8 +1201,8 @@ static int __init gunzip(void) magic[1] =3D NEXTBYTE(); method =3D NEXTBYTE(); =20 - if (magic[0] !=3D 037 || - ((magic[1] !=3D 0213) && (magic[1] !=3D 0236))) { + /* SAF-2-safe */ + if (magic[0] !=3D 037 || ((magic[1] !=3D 0213) && (magic[1] !=3D 0236)= )) { error("bad gzip magic numbers"); return -1; } --=20 2.34.1