From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 3966E38560AA for ; Fri, 26 May 2023 07:01:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3966E38560AA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34Q6xso1027995 for ; Fri, 26 May 2023 07:01:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=WJ8rgBFUDdHewUlJksGwUP+/QshOviJn0ZYoxvOI3BI=; b=ck5YJQZpvmwarC9WTExxO/2tPgp6sfQDMPgVK+DIjCncVaKObQQK7z/D56esc0xZ0cMR +7kJbcJidocAzBsU5R2KG5dCe3EldlYBFt9wwWDjfyqVbH5JV6v0jD6Ybr1LBgBA34pi iGdG1XUIPU6y8Z5gCoYiYwoiFRPtlpBdg3jyEXz+ODLzoRosqHy3eD9u2pgoQbvXcnvk cbqvp8oFaSO1emiBUV1rNQS24YD8emSwJONMhEbSu0aG9TLm3hUfHpGKT/kjmvqTZ72c 5ikVvifPutTXip63+lQF3i6LISaCAxSNoG1upwaRaoiH7RpFNDb69NpmgdTTDg/pjNRh 0A== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qtqyvr04h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 26 May 2023 07:01:45 +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 34Q5UTKj028764 for ; Fri, 26 May 2023 07:01:44 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qqk2uuvum-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 26 May 2023 07:01:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j/UWzuM1ZV/Qe0AD11exKSdnFWW/uqBNEMadiqGMsS7dpNOv9yXkY3ySkC+qonzo7VwuDF6QY1iEVCPQ6o1MoMpDikKEBknzs8vM8oc9BBfVuB7qIrjK2BB9fa2uqwx0IXqVQmrwCWAjuYf0fVfgHemjbsefOpbAPdlkD43wMk3DAVu3yBvZKYvtdr3f2CJTQgTk1yY6V7TLV0rgc+MI86tsl7Tk/RA01BfekHoXhTKcQOE+AhBTm8vgNmWhnSgxxtrl34yrWZf9I9y3JBiFyUITPvTMoDdcnMOoibOLWcvW+PgxNepeofMbvEQu0liO6GTCanV/3YMlh6a/Pwsrjw== 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=WJ8rgBFUDdHewUlJksGwUP+/QshOviJn0ZYoxvOI3BI=; b=Xwm4RQfPnmFkLcc4m+m1yfHHrz2Y6Xx9Dih3FyV1Iak92v/AkrJx4rD3qsje5bsVttO5a21gnOFkR9P0ATn7M2iH3LmAMMJAF1Du7/1lNPWFPY1oII4yTMIPYSgAZAEUZbf4fuZi5q/SicFU8LjnGL+4IKPG3RG4v/82ibTgWeCITKLPZh+xxOfeNwfasa/cqqiYMUy4vq69wH8J1YaAA1j9D4XBLZMZFZfoxEDlonwD68+zpdZ4+2T8XXt3yMxxcg6Y8tqCqeG6PxuWNH3nFCizN/v0ZWss4MIrOIdZE6IPiLLkWMjzFLOoCUgm48ojbIRmkaygQDuCSk628nRgmw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WJ8rgBFUDdHewUlJksGwUP+/QshOviJn0ZYoxvOI3BI=; b=y4QZ2E+VjpLX+LoX9ABFWDQEgUjDkt0NkS4vpAGS7NnEd9pUowJA20vRK3ge781GJTc+XOqK174mKxAVj0VMIsDl06ZfhPGN9dgpiuxTSOTmo7KFDhgYrt1QoQffcvns+sauTo6BAGdRHJ72A1/+Ps/6inK45w0KdhF2svKRlyc= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by PH7PR10MB5879.namprd10.prod.outlook.com (2603:10b6:510:130::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.17; Fri, 26 May 2023 07:01:42 +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.6411.025; Fri, 26 May 2023 07:01:42 +0000 From: Indu Bhagat To: binutils@sourceware.org Cc: Indu Bhagat Subject: [COMMITTED] libsframe: use const char * consistently for immutable FRE buffers Date: Fri, 26 May 2023 00:01:30 -0700 Message-Id: <20230526070132.4185600-2-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230526070132.4185600-1-indu.bhagat@oracle.com> References: <20230526070132.4185600-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SJ0PR03CA0288.namprd03.prod.outlook.com (2603:10b6:a03:39e::23) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|PH7PR10MB5879:EE_ X-MS-Office365-Filtering-Correlation-Id: e90a7127-dd67-45d7-1b04-08db5db70f43 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JMH+yzf9Mwx/1DzOXXQPFP8Wq9CQDH/v8M931EGwk9mBu9mMcxCa7BQQ8NSitS2bHELDYnDWozxKj4zfH6DCHeXs2cZvDBmZoKr488r8jr0zFnEBgwxVmuaDsk1FPwXIXeuZPOx/4d/ig9UlAgulHbMuxqcdonPVZZosM+LYjVhZtRNsSaaG4fS86zHvR9WLsGc/M+AxlXGaPqyY/KdrMyN+wbemNrkScHEGOxkCCvhjCC0gChEHCQ1TyXjp/0Rr1AK+cmEw4f0OZfjHw8ESbuFEnILmy6d51fIWkOJrZK4reOlSt+iFMjUTljHFbMQFwFIK7LySoj6bOA7bs/5emH/oIO3wIoWqb/7aD1gpoP43waWMtzyGdiyTT6hIKZn7DdafxMBedImhCwMD81IRNPcRyO4WsMiV7D8ET1oWrByTNjDT+Kcpc+y2uaOS6TIZMQFC/EKrl2sAnHHs6pAuGl6stA2cICqhGZ+EW98aviY0UX8hMvs3R9kCv7t0oEk0cD3Y2HunJLYp8R2V30s3NLdnDd44+BiLW6nvoI6YpMI1iDySvWzCr61goosAqe2n 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)(376002)(136003)(396003)(39860400002)(366004)(346002)(451199021)(4326008)(316002)(41300700001)(86362001)(6486002)(36756003)(66476007)(5660300002)(8676002)(66946007)(6916009)(66556008)(8936002)(6666004)(44832011)(2906002)(478600001)(186003)(2616005)(38100700002)(83380400001)(107886003)(26005)(6506007)(6512007)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?an4DdoqDJ2C1KK3Do8KwHo7uel8UjZdbjRuyQ7Mr1CKb3SvzOqkMqBF5d49f?= =?us-ascii?Q?lKHg0hucZdD2vJsq+f2r6R9CDA8yaJzOd9+6opusgzoYo3T7Q5GnKO/9CBWz?= =?us-ascii?Q?beUhKPNU2vkuvUHOFUQXPTM9A1mqs9MPX3MQYQomck2KicLH1sXB1DEy/88a?= =?us-ascii?Q?/bAdY8nSmCcr/1TavefzxTvvjBWs9gewrRNIbddfxhWqRWIQALtv8X3vTQ28?= =?us-ascii?Q?wlu5uZTa9/+DKv1+Sz8fbvEGbH721fP2Jxf2MAsgaBr1O7jlKmgZsVF7TCAv?= =?us-ascii?Q?AMwUvVWq3LK4GIRgOvl5FR/iiKq9sQdgGqbO2Ld2F1bb+TfKeOW/wlpitkDe?= =?us-ascii?Q?tRTYXAXtKA4PWSVcdmyxAJMFOfyss6rTXorxaxzJJ+ua6T9xVAyDjqxfZmgk?= =?us-ascii?Q?oJgq3QuGayPSe7Z+RLLaNYldyy0Xw9jf/hRAjRyxkUtggOffRK/Bzezr8V/8?= =?us-ascii?Q?DBntmTRPTTYAlvCi0dBc0TlpKiyWU94qrZPwdV5nSgHLI/L5yGA2gxURu4Xm?= =?us-ascii?Q?AOTUpcl5ofJwjw5/uj6IxybfgCNJgrhoR4BVFwJzlC57Zd3HgQaZFbK8WvZI?= =?us-ascii?Q?U4Pn8N6BKq/8qnkL5LKmTNFo9GLsBa0ff9MezuruW7xya4tFGnt568/0qLsZ?= =?us-ascii?Q?lqErccyvnzkBy/WkBJ1RY1YTLiXOghbm/1EADfVKsHCEWyavcineezwFet4n?= =?us-ascii?Q?0k1X3BQx7vkxe2QsBQ2N3AA/zg1T/gIBWLKrJ5tpHA36jsOamaDYnUSP1Z8M?= =?us-ascii?Q?X1h0lUkduoQ4JuTwi1sGRpMrnvL7gPFykuUMQJgjohpGqEHq8ny4cHD3NSIF?= =?us-ascii?Q?q6jJK3D7N4SJnpxHhH8OQuD1iuVUXXdqztGcxwemHk4uIASvT5Sl+VukbOVR?= =?us-ascii?Q?cH419RYGa6fpRFxsBitF435A9L4nwtHltSuGbVtn1hTVVSIq+nGTxMYZnKME?= =?us-ascii?Q?/8l/BmL6wtO3z8U859pHOCnZsouY9ThAhPxD8qTKOZRUYuh1p14y2HXVX0KA?= =?us-ascii?Q?ieP0BV+0lbeRMfJfuwL3/grSSBsPlxbDN7UQrjd0J0MWSrg+myGPDtj3dVW3?= =?us-ascii?Q?jwP7WS7uQzMpqf2Ac3S/K+qp5CJNLTYynODfLovnhkREI6p+h79XAJ5ytnRh?= =?us-ascii?Q?0VJzAVw2GP6KoTpZKYB7Cu8UDSnG2SLl0tR3sTnTyPaSU3fIpyf4WWSwha+n?= =?us-ascii?Q?bqPXsILYRymvBfEQar/nFa9yma6u2o11rsiUaXv4WyDK77rziPhx5t9sb8f1?= =?us-ascii?Q?6UAq6ztiYrO8l1kaiJM6NfbNz3ZrgMwoVbuhWIe6/8wEdSvyjVO2ozJ/sjWC?= =?us-ascii?Q?eBLHeHz95XnHCSZ320MJ7Xxa2Osq4wmkw6qrjuyWumxbcveNIVwOalQUTr7l?= =?us-ascii?Q?mzodZwoxrojzIy7KYIaixzuTCvg5/LWFPLuzu4l13Mm6+DwtRO5A3eDx4iPZ?= =?us-ascii?Q?IuwHIIKdvL04qfRezraXh0rpPcuBLK84CRfdXmaVY/cyFKaZqGDvzVsucoPs?= =?us-ascii?Q?7fmKjqPdSIlhIVvWIH4lq9TsAv23Rd7PGncUw9vc8A8FiUonDiQ+vyhAYWkK?= =?us-ascii?Q?TGO1adpAJ3E8SfO3wY7W6/eIsO5n1Owu+8MjrHdv?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6l6tT1AdP/RkpqyL2vqmxyB1MxR96ug5hK1jfQxLHIjvTXZ7Hd+5R1tjjaG1q/yuoY/R1Ci0uO4pyeTq7qC0bu2CFw4g/yiKZwVRqIblbMnugPP1Pc+lruWhP0CiiSxHwpb8i2mQqexqlH+sUcnaeT9UMcJ99MQ0h62FdMXQRQ15rOuRwPClZjVrbCuxvKB7ur6sZUvoF9Wd5BnN3jIj5yhCFpT1tBBcwkI4OxiXiXkKukWXI88TZ6MGDjbf6W9XP/HetrNXUCkktZ7KM0dg0krHxs6fsjY/c3pQQ9e8UsRpoysRNpckIIVP//ggNSXRL+uLYhtFXrgYXF9yIIaG+smt6jYUIekCKySdKo6lonX8pC78b5joEN6oCvfHFSzmorRHsk2jgFd9vlUoQS3s7TEsFX0RCy8r96KndrMrqqdVVPC+ooYR2qo6wj505OFLhZCC2+oh/pJzpIFCl30Tnq9d+5mdOH06Iyv1Q7VPAhhXv/XfL00FvNK+fM4xhoNzB12tMX2kDUZJy58gfo98TV5TFpSXPKtaIfx2r7SGAGVPxkYHRMvdBigVPZpYhe8ox9VfuzYZWsJD9bpO/2nStSUJVZVC8YlSKHs6xb/TNVeKUbFwkX2Zu6IJfLTZSYsBz7ZVQsBD2aoVeC0hwBcLb+nrmAddjz9Xs6JV0I6LqoNTiiYzkn7U7Wrgiur2gG+rTSWHzZqYLldb0Hz3yTsq9AgA8mRF4Q4oHI9HqhOVoBZ0u11auLreRL9ZKT5sDir6 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e90a7127-dd67-45d7-1b04-08db5db70f43 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2023 07:01:42.1500 (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: 7TTCEc6EBvZo61YueM5RZdyyPnkRlz67tANOyE4VXVRVVMDreSh4HSAQjGILP+hfZaYaEP+MaHFtygbf3WbUgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5879 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-05-26_01,2023-05-25_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305260058 X-Proofpoint-ORIG-GUID: _whn8a2FdtGGK3ukGz59qVw7tY_djq4a X-Proofpoint-GUID: _whn8a2FdtGGK3ukGz59qVw7tY_djq4a X-Spam-Status: No, score=-13.1 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 List-Id: libsframe/ * sframe.c (sframe_decode_fre): Use const char * datatype when handling buffer containing the FREs. (sframe_fre_get_end_ip_offset): Likewise. (sframe_find_fre): Likewise. (sframe_decoder_get_fre): Likewise. --- libsframe/sframe.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libsframe/sframe.c b/libsframe/sframe.c index a79d4de96da..72b221349ad 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -733,11 +733,10 @@ sframe_decode_fre_start_address (const char *fre_buf, static int sframe_decode_fre (const char *fre_buf, sframe_frame_row_entry *fre, - unsigned int fre_type, - size_t *esz) + unsigned int fre_type, size_t *esz) { int err = 0; - void *stack_offsets = NULL; + const char *stack_offsets = NULL; size_t stack_offsets_sz; size_t addr_size; size_t fre_size; @@ -758,7 +757,7 @@ sframe_decode_fre (const char *fre_buf, sframe_frame_row_entry *fre, memset (fre->fre_offsets, 0, MAX_OFFSET_BYTES); /* Get offsets size. */ stack_offsets_sz = sframe_fre_offset_bytes_size (fre->fre_info); - stack_offsets = (unsigned char *)fre_buf + addr_size + sizeof (fre->fre_info); + stack_offsets = fre_buf + addr_size + sizeof (fre->fre_info); memcpy (fre->fre_offsets, stack_offsets, stack_offsets_sz); /* The FRE has been decoded. Use it to perform one last sanity check. */ @@ -991,7 +990,7 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, sframe_func_desc_entry *fdep; uint32_t start_address, i; sframe_frame_row_entry cur_fre, next_fre; - unsigned char *sp; + const char *fres; unsigned int fre_type, fde_type; size_t esz; int err = 0; @@ -1022,10 +1021,10 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, if (fde_type == SFRAME_FDE_TYPE_PCMASK) bitmask = 0xff; - sp = (unsigned char *) ctx->sfd_fres + fdep->sfde_func_start_fre_off; + fres = ctx->sfd_fres + fdep->sfde_func_start_fre_off; for (i = 0; i < fdep->sfde_func_num_fres; i++) { - err = sframe_decode_fre ((const char *)sp, &next_fre, fre_type, &esz); + err = sframe_decode_fre (fres, &next_fre, fre_type, &esz); start_address = next_fre.fre_start_addr; if (((fdep->sfde_func_start_address @@ -1037,8 +1036,7 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, if (i < fdep->sfde_func_num_fres - 1) { sp += esz; - err = sframe_decode_fre ((const char*)sp, &next_fre, - fre_type, &esz); + err = sframe_decode_fre (fres, &next_fre, fre_type, &esz); /* Sanity check the next FRE. */ if (!sframe_fre_sanity_check_p (&next_fre)) @@ -1141,7 +1139,7 @@ sframe_decoder_get_fre (sframe_decoder_ctx *ctx, { sframe_func_desc_entry *fdep; sframe_frame_row_entry ifre; - unsigned char *sp; + const char *fres; uint32_t i; unsigned int fre_type; size_t esz = 0; @@ -1158,11 +1156,11 @@ sframe_decoder_get_fre (sframe_decoder_ctx *ctx, fre_type = sframe_get_fre_type (fdep); /* Now scan the FRE entries. */ - sp = (unsigned char *) ctx->sfd_fres + fdep->sfde_func_start_fre_off; + fres = ctx->sfd_fres + fdep->sfde_func_start_fre_off; for (i = 0; i < fdep->sfde_func_num_fres; i++) { /* Decode the FRE at the current position. Return it if valid. */ - err = sframe_decode_fre ((const char *)sp, &ifre, fre_type, &esz); + err = sframe_decode_fre (fres, &ifre, fre_type, &esz); if (i == fre_idx) { if (!sframe_fre_sanity_check_p (&ifre)) @@ -1179,7 +1177,7 @@ sframe_decoder_get_fre (sframe_decoder_ctx *ctx, return 0; } /* Next FRE. */ - sp += esz; + fres += esz; } return sframe_set_errno (&err, SFRAME_ERR_FDE_NOTFOUND); -- 2.39.2