From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70080.outbound.protection.outlook.com [40.107.7.80]) by sourceware.org (Postfix) with ESMTPS id 0A1883858C74 for ; Mon, 15 Aug 2022 11:17:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0A1883858C74 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fhlZFPQROYXhBcd5vI6jxV/98fgQvDIqHHDEccKbzlIGbxXpy5f1FEzeg1uMh8ElhPsd3DkpZr3oEPc5ibRbRxklQCiqbeuojrWdQKy8XGKNZuKb9RgqSijUWZhQyVnKwyVf5JdkRX0nHf6hDJJYGpF5FZk4qfKXpHo8m3EUMsqk6xdaVEpngHH7YCU491dgVZWNsTAjsK+c+/lSoJge5dFBba4o4MOCHd9HSpX5ehovyZX5XON3hIBQwsVLIOcBq2CIxYVVg1wP8tsw5+jLYNawdNxcDW0IThCNfDbzsDIhAPNqhxJtLVbfabwR+PAePv9m5cEZ+pQ3gSB2MV/6Jw== 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=Yl3q8QgtCB14tyfelkB0j7fdvwM+E7Hjy8hQtT7LUJU=; b=gHeu8R+DvjkVZYYnOAFo2O54fNO/PAjAYf0ILq6zoEcU78utTJHHP7shHYK0HaQHcYEfYLecRzTgQ0fBMwPN8ump3kv14tAWXsYfkOnOWsIIldq8u093fNxX2MZnP7nwcQyOVOyCofxPWKKz00iwuS1CG+avYN6DyhArPXtIC2uHZSES+DjC0e3tb9UnXaCG8DrlF5G9GzExyZyKf5nzAxBLtylIXurMOhAbSF9Kvsfg7vc54nWFH571Mi+6724kL/eug7MBpraPw2RnPTdIhK8Eqx4jXgyG/FrrSdp8tPCwhMnbnBxw27P+SrRQE1GiZFMkHrMD5giBP9Du/3qDNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DU2PR04MB9114.eurprd04.prod.outlook.com (2603:10a6:10:2f5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Mon, 15 Aug 2022 11:17:25 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2d5d:bae0:430f:70ad]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2d5d:bae0:430f:70ad%4]) with mapi id 15.20.5525.010; Mon, 15 Aug 2022 11:17:25 +0000 Message-ID: Date: Mon, 15 Aug 2022 13:17:24 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Content-Language: en-US To: Binutils From: Jan Beulich Subject: [PATCH] x86: avoid i386_dis_printf()'s staging area for potentially long strings Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR06CA0753.eurprd06.prod.outlook.com (2603:10a6:20b:484::9) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dcbc9fde-fb0c-4ed1-4df5-08da7eafbb63 X-MS-TrafficTypeDiagnostic: DU2PR04MB9114:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PG146KAk4jV4jqmEuGwsw+hgBdYWlwqMtomzVqULfhrPJvBBTaEmXuUDBoGGRJ01bymoHt/mfDeodApF6L29uB8ATNU++PDr7HmxpcOiY+JmYCaj7FZM4GikFhFd9vR+Vdy3toKM+MjrtLFsDuwlXdCpgDR0e5cDRee/RV7xlQjrNzDY5opN+pgseADsg1S/Llt8qQUOKdElKAI6kXkJWoB+cVu2TtEfil2UlmmnVkilZEyyN02+9Bii6TrNOlpgT8rZVKs4y8QlEnPrH1fp4CaBJXsygH4fHaN7ztrNg4A+T50KQFEywjd4YQwT1WwSgMW/4SWyt/ludRy2qeFBpxrFRG6lOkLQsBb9M4c5nZGz9ovoFhT3vhS3i45Td3mtQrBwm9r21wJx6UBZA2C/gUDWEXHcIlCQXFWV39exeZcqO33Yq2Ms/CMMTWw/n+RhV/jm7ONBDuejjQ3P7p60cE9DU4V7SlXtb+fwkJLMdkXDFOmtHnvnwWaS/yZ7tsL34PeaF8AkMJ9qt1q5ms9bAEBgiP4EUBBgmA7REsX9htuCyyplFN3OZCoDLShPsHjKBvfw3P2YN8Lz43uguuIxqpPUVGB4iGGgC+RZ/Ro6JeHUf4YvGj4/suOqF0wrelpyvIGAJTrX9kPkywzXyPR/l/doN30Shy84j+OqUPph5krzIzCCTRNFQBsn7aUjMa27fmKThVrnDU3EnbIiq2222ZXMzP+wqDjoVTPzAy+NcRRCax/tCLga8YDaHKk+vSyi9cWORn+oIQqkOTF9asYsJrleR28fkrbYGAHCjj4t5Nm7R/Ntuf9Uc8qAJp1B1zw8IoiHd4Oeul0PvJim6SBGag== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(39860400002)(346002)(376002)(396003)(136003)(54906003)(31686004)(6916009)(41300700001)(83380400001)(316002)(5660300002)(26005)(2616005)(186003)(6506007)(36756003)(6486002)(6512007)(66476007)(8676002)(66556008)(66946007)(478600001)(86362001)(31696002)(4326008)(2906002)(8936002)(38100700002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TUVpU2JaUm8xdFlNMHYxVUNZMk9McHZhd0ZxM1Ewb0hBd0ZrZmgydHhjM2lM?= =?utf-8?B?OWFlREFRL1pYZVg4SGZ2RjhId2g0TEVhaWhrZVBqU3VWZ3RzRHVnSHJJc1Rt?= =?utf-8?B?K2tTdXNEVzVxRjBkcko4bG1yTXd1ZzNRM2IxZFVTYlhML3hIOUNrQ2RybmZY?= =?utf-8?B?N3RCdXQ0U1piYXpXMUdhdmpMcUZxeElPVzRqWmIrcHBOTG9JelZYTnYxSTZp?= =?utf-8?B?c3psUkkxWEVCRHhDejRibDRIYVY0eXBYSkJrWWVKOXF2SWlKY1ZLaC9uZ2RV?= =?utf-8?B?OW5YM3RBRDQrMWx3cXQwbDZYYkZSdTMrY1h0UWlabllCTUIzTXFzRDA1UTFT?= =?utf-8?B?R1poVXN3bmdBU212VmV1TjFlQkZwWDNTWndxc1g1M1RRcEZlSXowbGFsSWFZ?= =?utf-8?B?bEEzUytyRzJhekoyVzZlRWtOaFRONWVuMVpjeWRrbkVZMzg0bURJeHBMemtP?= =?utf-8?B?RTFiMmRETHJpNFQ3RzE3L3NxQ1JSV3hhS2ZCcTZTZE5KVll0ZFB2YWl5V2tK?= =?utf-8?B?OE5MTE5YWnYzeCt1NU52ZTdzV0kwVW5tU2MzdTV0ckZhREx4WSs1ci93ZjN2?= =?utf-8?B?YUdjMkRUVVhWWVN0MUpJVU5kc0N5aVNUOUcrRXdsYkE1MUVrWmVqVE9LcmlU?= =?utf-8?B?bjUvTVd6NFM5ZzAzblljZHpYQ0Mydm5rVnpFYzlyU3hJVk1WN2Q1SjJ0V3ls?= =?utf-8?B?UVVvWGlTZ3Zoc2RnTG10dE5KL3ZpZTBiSHJFNlVsMjlhYmpPWnl6a0p4K1JF?= =?utf-8?B?N2RaazZRamlqN0k1ZXcvSzVnTUJEcFVmN1BKV2JxLzBkVVFVeFA1Z1VvdGdv?= =?utf-8?B?aVd0d2lQRjhNaUR4RVNHWFRDZmtEV0VFOG1YZk5ESEppMUdnajJ3bnF6Qm5W?= =?utf-8?B?alZmK2p0bmU2WTFWcDJMcS9udllNTFMxa2ZVajVBOE9rc3JMdnA0dmQ3SFBG?= =?utf-8?B?Ykgwc1plcktoYzZSUmFzY05vbnJNeDZqMkNibXFDbExuU1VpZmhKUXpzZ2s3?= =?utf-8?B?c3dYQjE5aTEvQ2Q5QlhMZSs3WktyM3Vlbk1vaWUvdFlUQWl0YkxYTkluaVFl?= =?utf-8?B?T01PNHdselRVdTN3b1hwU0dVMWpLUEIrT1RSQ0tkRnU3aVRrUFI1blUxRCtk?= =?utf-8?B?UkdNU3g4ZmsyNVRsRWlyK0JRME8vTGZZQjg2THdCbm5kOTVMVDlMVTBkemg3?= =?utf-8?B?Q0w0eDllUUZMUklDNEpwbGpTZzJ4Y2dRQ0dhSU94b3FPS2hiWGxraWZqazJ0?= =?utf-8?B?VWZTVTk0bi93QWhFeS9ITktPalJNeHVkcTJSVWZucWlWOUtOSWp5Y0NvblNP?= =?utf-8?B?M3d1OXRTY3dtU1Q3ckRWU1VwakhJd3RadXhGUzBickszZjV1MW9hcmN4Vysr?= =?utf-8?B?WG1OeTUyUWs4TnJlREo2V0VkRlJTK0w0WmFSZUdieHN6K09YRFBDSUNSakpW?= =?utf-8?B?YldEeHdGbDlwbjZrdkJzTklQSlgxRmRDMTBqS3EycWlUckk3WjU0ME5HWm9P?= =?utf-8?B?RjhHcXZUTzdYY0tWNVhyQnpVNXNpY0prT1ZzUXFRQVBnUXVsUVZMcHdyOFJa?= =?utf-8?B?UzEyM0RZMHFjZ2RwOXZ2MHRZVjdxNG5hbHpxRnZBTXdvVWc0ZFJBUjBiaXgw?= =?utf-8?B?ZW1UNnRqeTBXQWxROGJub1cvSENSTlNpUktVRWtEaEpocGprK0xKQy9lelB3?= =?utf-8?B?cTZIR0hhUWNaOFZPWmE3aWVXNGhtN2pnQXQyK2NMUDlnVVhoRDF2a2pyc0Rw?= =?utf-8?B?Y3BCZzRxQkhoVXJjYTdJL0Z3YmJvYlAxUFpCSFpDb1FFUG9SdFIzT29aQXVS?= =?utf-8?B?NnZ5ZGZjVlNzcy9YaUdYWEdnS3ZUTnV1SmRMTGJpKzNTRG5iMEdMVjQ3NGtH?= =?utf-8?B?SWlNb1NEbThEZzlYRmowT256czBiWWFzVXZtL1RSUDFqN3pHWjkvcTUrK0hP?= =?utf-8?B?YktBUDRSVHZNT1dRVlRhV0Zja21uYTdLbXc4NTVCOTAzdm5sQ21iam1WU1d3?= =?utf-8?B?M2h6S0Y2SzBNNkVZTm8zT3k4R1VSb05Qb0Q2Q09FNlZpNi9iTnJObWJYMDBy?= =?utf-8?B?UlZHNlRQU2xVcDl1OHNPNTFqZW1Ydy9UMVZWcUpCeS84L2ZBajY2N2x6S0xh?= =?utf-8?Q?AajfGwWDeBCdGfVLEAnzLLddK?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcbc9fde-fb0c-4ed1-4df5-08da7eafbb63 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 11:17:25.6445 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bzzlEm5PJpf5Woc9elgbru+Ob+ZIaSzko6rplcSLGRL6N+Gs08jBIvF3Xetq99Avl1HCnxng7nriSy8bXAOnrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB9114 X-Spam-Status: No, score=-3030.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, 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-List-Received-Date: Mon, 15 Aug 2022 11:17:32 -0000 PR binutils/29483 When print_insn() processes op_txt[], it may pass strings into i386_dis_printf() which staging_area[] cannot fit; this was observed for an invalid form of VPSCATTERDD (both broadcast and zeroing-masking bits set). Rather than arbitrarily enlarging that local array, avoid its use altogether when the format string is simply "%s". This merely requires two local variables to have their type constified. While limiting the scope of "res" it became apparent that - no caller cares about the function's return value, - the comment about the return value was wrong, - a particular positive return value would have been meaningless to the caller. Therefore convert the function to return "void" at the same time. --- An alternative to the special casing would be to introduce something like i386_dis_puts(), then to be used by all call sites which currently pass "%s" or format strings without any format characters at all (plus, of course, i386_dis_printf() itself). --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -9264,31 +9264,40 @@ oappend_register (instr_info *ins, const STYLE is the default style to use in the fprintf_styled_func calls, however, FMT might include embedded style markers (see oappend_style), these embedded markers are not printed, but instead change the style - used in the next fprintf_styled_func call. + used in the next fprintf_styled_func call. */ - Return non-zero to indicate the print call was a success. */ - -static int ATTRIBUTE_PRINTF_3 +static void ATTRIBUTE_PRINTF_3 i386_dis_printf (instr_info *ins, enum disassembler_style style, const char *fmt, ...) { va_list ap; enum disassembler_style curr_style = style; - char *start, *curr; + const char *start, *curr; char staging_area[100]; - int res; va_start (ap, fmt); - res = vsnprintf (staging_area, sizeof (staging_area), fmt, ap); - va_end (ap); + /* In particular print_insn()'s processing of op_txt[] can hand rather long + strings here. Bypass vsnprintf() in such cases to avoid capacity issues + with the staging area. */ + if (strcmp (fmt, "%s")) + { + int res = vsnprintf (staging_area, sizeof (staging_area), fmt, ap); - if (res < 0) - return res; + va_end (ap); - if ((size_t) res >= sizeof (staging_area)) - abort (); + if (res < 0) + return; - start = curr = staging_area; + if ((size_t) res >= sizeof (staging_area)) + abort (); + + start = curr = staging_area; + } + else + { + start = curr = va_arg (ap, const char *); + va_end (ap); + } do { @@ -9303,10 +9312,7 @@ i386_dis_printf (instr_info *ins, enum d curr_style, "%.*s", len, start); if (n < 0) - { - res = n; - break; - } + break; if (*curr == '\0') break; @@ -9340,8 +9346,6 @@ i386_dis_printf (instr_info *ins, enum d ++curr; } while (true); - - return res; } static int