From patchwork Tue Jun 27 21:20:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 113618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8480007vqr; Tue, 27 Jun 2023 14:26:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7obHGWp0VuKnp9qPaNKupX6RDtxQ5MWTn4AHpXl1B5fDiY+kJ14NVod51k4MM9HkIvw3jZ X-Received: by 2002:a17:907:8694:b0:988:fea3:ae56 with SMTP id qa20-20020a170907869400b00988fea3ae56mr21278167ejc.0.1687901166516; Tue, 27 Jun 2023 14:26:06 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id y27-20020a170906071b00b0098dfb10f3a6si4280189ejb.107.2023.06.27.14.26.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 14:26:06 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=DCLKTKkn; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F302B3882AEF for ; Tue, 27 Jun 2023 21:23:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F302B3882AEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687900997; bh=CMIDfQVVqmto9kMVQwUpFUWzMkW51ILsIyjzgWwD9AE=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=DCLKTKknIPyk3oh6gjPJS71kRzxjZiaYK3RhyII2OBzlH5+nYdU4sMj7HFJlji69p a8JpfoL6qfnmdHZkaZ6Ml17n+UVAUR0wXKeeMVK2B/ywmAESoZ20pFQ2WLfK2Dqy7C R4tmgu1gfvrhYz5v/EmnWjomBnJZmSdFLiOAczzI= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 4FEE83858408 for ; Tue, 27 Jun 2023 21:21:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4FEE83858408 Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35RJqmHp023734 for ; Tue, 27 Jun 2023 21:21:14 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3rdrhcp646-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Jun 2023 21:21:13 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35RKohQS013113 for ; Tue, 27 Jun 2023 21:21:12 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2044.outbound.protection.outlook.com [104.47.73.44]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3rdpx5d10k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Jun 2023 21:21:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LwmmDtNXX7WybpqYXIveyMjjRjB/vbBbDpWGCH99WrDdodEJ/zhf6kUyyi7nVDwu4JYm/1AkbrnGJkGO8op/9d/uoTBmB7U5FKo1JlC7ekbxtRPnXCRtJZcz1pCHEuMzaLFypk/KUh16DOJe3HYXv959DOPpqkaKewO3+lXNuRWqOHDJp4nMkOW2n3/353hZOvC/uvMMuFqbhtfIUr64thcYJ6iJU5FHnrL4hibCOwWelEfyKRycvhf3gKYhsPg6PhGo90HjXXE7dxNPlzHUGkdf8zuJ/VcTKW/ZdzWtCVR1DKN58c+6Nagx/zlC+rCiXSpFusxD2QXTzG9EzFtSog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CMIDfQVVqmto9kMVQwUpFUWzMkW51ILsIyjzgWwD9AE=; b=LWKX8JG/Jm4tCQFk6KPox1SX+2KjmGXcmhPR5/h7NAjQjhWqBj3Zt5rkoPlZJtXFkSYn5trxCD932gju2x7zrFwnt5h6FAXhJXYOvB1ID4U8xPC0U0s4ZtAvxI//JiLM2jieHfs/OSTBSUIo+lDJ165mnTAbWvRCRhMu/WYRoYbGrLrHK8T09cAt4hwHul7nypOhK/j+GYg+Gwf1D22cv1UqWoImanjJ74JH3wtflGJM9SnPo2/uFQO/GzO1NQHJOKhXUE8NFOdniedO5f5I0cfAJ2ucGTgLm1ZX+sk0W7++emq4BfKEeCjZsqBhK6kag2U73wUFApqaeGgbTV8N/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by SA2PR10MB4602.namprd10.prod.outlook.com (2603:10b6:806:f8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Tue, 27 Jun 2023 21:21:10 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44%4]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 21:21:10 +0000 To: binutils@sourceware.org Cc: Indu Bhagat Subject: [PATCH 05/12] libsframe: adjust version check in sframe_header_sanity_check_p Date: Tue, 27 Jun 2023 14:20:21 -0700 Message-Id: <20230627212028.2138604-6-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627212028.2138604-1-indu.bhagat@oracle.com> References: <20230627212028.2138604-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW4PR03CA0008.namprd03.prod.outlook.com (2603:10b6:303:8f::13) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|SA2PR10MB4602:EE_ X-MS-Office365-Filtering-Correlation-Id: ded8b6ab-4e1a-49f2-c50d-08db77546db9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TMnlHkY/R/JID5Id3qXeLwKKCVtlretL7GlnE75VjtjI8K5lX8V0CVkdn8ydCf/jFfP+Awc3m/BS6WxfMuVQqa8sG8920TwTnK/CYKh3q+f74aupEbRPUIPn9lmAHvUzGXUbKCGAwoeSLSXojAiRSomJJSB1YfGpDvH2+SK96eYW21DUqv/fLogBseZOgvdWfYT1LaKzTlRRAhJT0GWaGElmXVFg5L2fKUxb7B7d98Oyn7boM7ZQYaqEAZDHA2zBXERoAlBVnCVZbQWP7qvCGw6QKDgdP4ISdbip6fRhz8xPGvioba3+QJYENLmx3yMFlM8Jyla1hREOndgpH8SQojUeQsOf9BOmjdZYmxQ+OZ4eqMLNPb9kgjgwryyfjJX0BMtNMY7ekoBIKwnfavvQKfCtBhcplCwkGpRYPZ+3e+3vZKzGZJhGQzMZVt40etLCHK8/YIpwOvBiZjmHd0iqOWJOE6PANS82O0n+GqxDFSVfBWx/AoAnz3kWE0z5eBWMvf9INY1S7E2obkFC6uVE9FygaeOXLfqHJbGdtUBIynC8ul0lEGFtgp/VbTiTLt/k X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1001MB2158.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(39860400002)(376002)(396003)(136003)(451199021)(38100700002)(86362001)(107886003)(1076003)(6506007)(4744005)(5660300002)(6512007)(66476007)(66556008)(66946007)(44832011)(2616005)(186003)(26005)(6916009)(478600001)(2906002)(8676002)(4326008)(316002)(6666004)(8936002)(6486002)(41300700001)(83380400001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5UHt8EpXi8obNfwjsua+tVojJ4dDMhee7GRZRIDhyqMFDdIxRAAhxwHNU1bdsTao2zOvj9YlcxXk98SmEbIQ6dky1E6oT6ptX/vhadW/gh0gMdx6Ac6B5xMGMFlD2L2zeeyHpRw0os+WqTqGzYisWwapdTm6NtlOjOre9hwpvmbplfMheJ6NCg2lgvYDm9eP/GFnq1P2sg+YwXSWyR7tr5sYRL9sCAOjPrNmb87dWeK5L0/LAPhNMv9CVCZb9oLOx+2cOd17sR0ZtT7QHCvo4yNCONcfB7kXw9VGSLQykW1wSZlRPDlt9oMf1lnX5/boSEpkkBV735l3fW/hfM45eZqtORV2aAdCCDaAqglFo9EPDv2FXI3mMGz/xIbbvZrUD1JQvdTI3DYeJoFrXj5y4eexuOjRQZFWNx9GX4N1yvlPWqI7SNasLHfBcfHhiHnJceJNO0jqZLPHVe2pSy7dATaXZyhQVjW69SV7kOOiDbTTODwunAircZ66DVmp+jHPr8VkJHnjZ9vgnlNSP6c90VrI6IJqou82xy60sxovub7xO1avmcKWcDjZRJnV5EGFlS/b+n1EdOyGWVKZ84BYq7H/R6jnnWfr5mCQumElIW0kTDatjxW5ORtpJQtVqSJfwOSmuqbMQjn7/FUkCPejUcgc9VJLyz8CXgLiHWs9NR98p8EjkC7yQZ79GREhUnmdS/Eulq55IjUtDwBWwitJPEKujdaj86WeLS6lK5xsrCPnmBXWqTRFqRq56BonradUOEK0l6aSlDkHMaZeKZvHT6k+JNZSqhonElLxHHXJJxgI84ZMLVtlbZTwXVw45q6trPAAAl11ZAygNjX9plLNDzCGHpHoVC8uuTpaEqDBm4X+gor4Vj1RQGRxdHj3LGrwjTlSIul51d9REv2HMDixTdpY4Nwin6wC8i8MT1Wf9JzgowP/vt4KkO+uLW+RRtq4w8Z4ljmyO6/4iPHl6qNt8mmM6no5GYN2+wp1ymRNFPj1RIN1z/uAHwGbrjxw39RyKSqiSLWI0swcIgHodo9PpZd9AT6ZPg+rYRIpv8hOOBmVn37XFDnhF0C+uECHNTLuHOgfUw1STEB7BA6PNnXb0qJdCeubfksEhE/hOMmBlLGdlDAGtUFnMVN+gBGfiLA5Lke0zieDx8gvk76J7e5LWy5Uh9pquntNOjfhFwsWCinHndl+wzfB58YHrTQumwEtsEl3g4q2ub53yLWct5z0jjkQD19p8Nh1Lso0AOFrkWeklowmDWJW+uBBn8vq/csCxUbtj8N5AvG1yWyarrz4QpzPXs3UlwUp8hh+CZUcxtjIxg6j1DzifS1Jd2CEUBeokrG/gJwCjfIIcm6e3EZnqUf9weGN0wh11YkCWgA5sRyVVJKM+y+4AXKlU9W2z28ajP1/MnAaQ4d+z4d7vMQfNWJyNmAMgt7/yBDsLerKaN8e98iKdH3u7y2g1ZvihzpiVJp36eBEpJGSh4XCREXzDfVeu+uvduqu/OQU1WaT08yXfRmulA85kYSa2kLPwwVSSXKwddQlHkZXFWZJ1b0mthR1ZcFxginApTPcuLm5L/QaGlPmomWjO3lVWaHjfhdX X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IiQbgnaRBGQ+PriehjQnoTUrwUZVGlQA1bSz7AquMbliK5/47UP7pdQLazQDX6iC3wP4JQohSOUfbB+xs6iYskmbHBrNURHRC4izpGe9iptu90iMT40Kw8MxkUtRejF1ahzhMxb+wRRDIQc68lW0sS/5uuI1mVpW/M25iGrKCMxsckGTo1n0s3/TW24OdB3EWBlarrUvouB4GFQU71DrzLyr7C2vxvI/Qb5xABevW+umS2Vrwz/Ox5t+jfkd7rRAq49AHdOOzEMEu5Nw70+aL+B1kmaj56uDtu3CNTRzR4LqzFEgkwTYRZyPxQ7Okq1yDzAcGtF4HkgYPiSwHZOJcMwSNzjK9orVVZARYYmriH2FFzXxodtoSgWucWg7PINRgWzuGawgyThRUyTKjJ8CpiErT5ZCV2sNtXr/vPEb57iofgLFrLwRI/GAw2kOdBdvvle3NSc6NLbXQmNbdMy8rdARZFoKoB29p6bgnptQtHZ/wMZ5GOw26DUEct/VQunSYYkbMLA7aop6RctzhBF1nCRAj/NSsy1XO6zGBa83+kvJhESx6P/b4fY6AB7d7fslE0YpWUfTeVe6rBub/fBhJC3JZzcUCV0PucpcM1qtgxRXJRLBiLuPUM07ZIJbeUtnxXmFADr0pVqhJunxbj932Ds1sPkLWnZjPVxUuzWVW/Y6c+iL6VoEARQeKC17zh+1dZLDV1eHPD0QhQW9hKq2Uw3/TvofeIVOgjiQQhl1KYDMaQCSWNeZ24JtDPlMWTb5 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ded8b6ab-4e1a-49f2-c50d-08db77546db9 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 21:21:10.6484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KA0cYMEx1DzQGcpEZJ8IiPHOBa6WeK2SeaEW0L1wLtF9m4DaO1a2lwzQp7eeBn4VCcEoFR9LHay/ZJlIZFYNzA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4602 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-27_14,2023-06-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 bulkscore=0 suspectscore=0 mlxscore=0 phishscore=0 malwarescore=0 mlxlogscore=942 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306270194 X-Proofpoint-GUID: yZkJ5HDnZKsS7whfDhWuJt2v3qbqJEMb X-Proofpoint-ORIG-GUID: yZkJ5HDnZKsS7whfDhWuJt2v3qbqJEMb X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Indu Bhagat via Binutils From: Indu Bhagat Reply-To: Indu Bhagat Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769892653165051585?= X-GMAIL-MSGID: =?utf-8?q?1769892653165051585?= libsframe/ * sframe.c (sframe_header_sanity_check_p): Include SFRAME_VERSION_2. --- libsframe/sframe.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libsframe/sframe.c b/libsframe/sframe.c index 7031cee50b8..6faae8d96ef 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -206,9 +206,10 @@ sframe_header_sanity_check_p (sframe_header *hp) { unsigned char all_flags = SFRAME_F_FDE_SORTED | SFRAME_F_FRAME_POINTER; /* Check preamble is valid. */ - if ((hp->sfh_preamble.sfp_magic != SFRAME_MAGIC) - || (hp->sfh_preamble.sfp_version != SFRAME_VERSION) - || ((hp->sfh_preamble.sfp_flags | all_flags) != all_flags)) + if (hp->sfh_preamble.sfp_magic != SFRAME_MAGIC + || (hp->sfh_preamble.sfp_version != SFRAME_VERSION_1 + && hp->sfh_preamble.sfp_version != SFRAME_VERSION_2) + || (hp->sfh_preamble.sfp_flags | all_flags) != all_flags) return false; /* Check offsets are valid. */