From patchwork Thu Jan 5 08:26:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 39386 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp192423wrt; Thu, 5 Jan 2023 00:39:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnDJoZ2ZXU2aFAlyGQHbDyAljfNDD04Dm1u4Wrge0Y/PuCsslXaCKtqEtMrHnT7OzD6ng/ X-Received: by 2002:a17:906:79d2:b0:7ae:987d:d7f9 with SMTP id m18-20020a17090679d200b007ae987dd7f9mr39453032ejo.17.1672907986213; Thu, 05 Jan 2023 00:39:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672907986; cv=none; d=google.com; s=arc-20160816; b=j79FiasYRx3GfCymp6w68rDf1KONpdp2rd2CzJq4+hBXZbR0DzZuARux9pwSLDSibY kzBQzFNtAnZ3GKN9/Vj6aH3ks9wND6poxGV5YCvXY6XzgK3QLMiq+UfHaunFNmSyVr1f eJ0vv9Bx6RvomiK6W6bkHrHEiUm10HTHhdAPxB6LhUyCA64g1GsuwViRaOIZ4ZfpCXIy gwfdiWXiusJqucMhMmGTBuf7zfYipE4Obzz8Iyj5vfxaEirZycOJwRJPTz1cMhpmFq61 IbfzWb+mzow5fFaAuMUGUhycNpEIJMXRb7R5UUB/AXbg/vdBbP170Iv2686lDRAIxlzs 26Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:mime-version:message-id:date :dkim-signature; bh=7v/gEXdtTx+UxkZcAUgCVgz4MqYf6krsrfnmQSxx5Nk=; b=UXYUByLCvcpbMUwo/znxGwzuv/0nJMRtqT9sygLfdiEO+jOf7JTqxt81jVdas23hht +1cAyQ5+phx8DJL2ZQ35kRvbUpLrsKbYyG6l/IQZuxIaj5P44ylgCotpE36FQSYzXpPe mz7YIwzwAHr3eoV0YnR5KQMCIrhtrt33/hmuyc8NEJN+B3SGoJDqMDTXMpmblEGky/9k PylReVhtnv1fGzFmuEQb1/tBQK+3akPAzsvnEraXbpuydg2cOszSXzdTc0q+G0sJpNKF B5aFlNr27ZRiy86IfOCYDRB1o2pwiy98fgAU+2Mgg4Tt4ah729U4MqhzL2sgFd2eHXKq xqhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=MOmoDn85; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di21-20020a170906731500b007bea4cb61d6si33675080ejc.424.2023.01.05.00.39.22; Thu, 05 Jan 2023 00:39:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=MOmoDn85; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231391AbjAEI1R (ORCPT + 99 others); Thu, 5 Jan 2023 03:27:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231556AbjAEI0s (ORCPT ); Thu, 5 Jan 2023 03:26:48 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54E234C702 for ; Thu, 5 Jan 2023 00:26:47 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id a4-20020a5b0004000000b006fdc6aaec4fso36660608ybp.20 for ; Thu, 05 Jan 2023 00:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=7v/gEXdtTx+UxkZcAUgCVgz4MqYf6krsrfnmQSxx5Nk=; b=MOmoDn853XiABNLgzeFY1zINcWjdyYDZgMjA+UzzOZtj9lI8m9iFChZ8xKfl5yhu7m GgQ4eeoUjNQwcCp66d6+VkJLXk5f1vbaPSLFAy/6UxTPSUznUMcPxKpfnw2XsTl8fgsi bkDwzfeHUylhi+VwwPOZh1rvzAuP2xf/p0aBbDEckSzuITvMJZGzno5h8Cz8WLU90KIv 95qcS0l7viSe07zEj+JjfkIKsgR4APZLrfGfEpD0xTWlxPrztm2446P9poO+EtTxj4Us ChabmwB0Gr7DT0OlsTqIhWL1e6E1yn5yVkl+xeuXIf4/TFzX/r0cfmm5xtQi6gbpnaLo ECOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7v/gEXdtTx+UxkZcAUgCVgz4MqYf6krsrfnmQSxx5Nk=; b=itiAXAzjEq1CEnyOiEAJg77xs76V9pH66t7kZ27DCH6C6nGITQIQVdOim55jjgV4Cb oFVtc4WpHikiHMf9hcoDLa7WWS4q/z28scGEdu2wPTH7NAN8geD11gPS9u6untGlZLo2 9AmgkUESc0E9/tdDj/QSCNUKSeJ2KY880dkr+9apwtKY/inXV3VAzNbh2wcHAZQih6SO rJ2Uu+njpsWURAkKx4q/KLPPpGO5uX9o/aqAfnRLBnSNEA4zX8HWQZgJ6X50naWuS+2k ijwyazRJoHUQt51kKRKqlsxJn55lff5bGNZ7uMklTiKqC25IzQFlmTsvywZF84nomM0D 9bNQ== X-Gm-Message-State: AFqh2kpfAE52WkkjOH75+stPgis3ZvtxXp/7EtiSVmb+ShBOURZjvsta FehNCQzq5vJzzwF2vYtPRC/naGiWXdRr X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:8775:c864:37e:2f9b]) (user=irogers job=sendgmr) by 2002:a0d:dbce:0:b0:4ad:7104:1f63 with SMTP id d197-20020a0ddbce000000b004ad71041f63mr1246510ywe.49.1672907206617; Thu, 05 Jan 2023 00:26:46 -0800 (PST) Date: Thu, 5 Jan 2023 00:26:09 -0800 Message-Id: <20230105082609.344538-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v1] perf llvm: Fix inadvertent file creation From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Nathan Chancellor , Nick Desaulniers , Tom Rix , Ian Rogers , Andrii Nakryiko , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754171164734791082?= X-GMAIL-MSGID: =?utf-8?q?1754171164734791082?= The LLVM template is first echo-ed into command_out and then command_out executed. The echo surrounds the template with double quotes, however, the template itself may contain quotes. This is generally innocuous but in tools/perf/tests/bpf-script-test-prologue.c we see: ... SEC("func=null_lseek file->f_mode offset orig") ... where the first double quote ends the double quote of the echo, then the > redirects output into a file called f_mode. To avoid this inadvertent behavior substitute redirects and similar characters to be ASCII control codes, then substitute the output in the echo back again. Fixes: 5eab5a7ee032 ("perf llvm: Display eBPF compiling command in debug output") Signed-off-by: Ian Rogers --- tools/perf/util/llvm-utils.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c index 650ffe336f3a..4e8e243a6e4b 100644 --- a/tools/perf/util/llvm-utils.c +++ b/tools/perf/util/llvm-utils.c @@ -531,14 +531,37 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf, pr_debug("llvm compiling command template: %s\n", template); + /* + * Below, substitute control characters for values that can cause the + * echo to misbehave, then substitute the values back. + */ err = -ENOMEM; - if (asprintf(&command_echo, "echo -n \"%s\"", template) < 0) + if (asprintf(&command_echo, "echo -n \a%s\a", template) < 0) goto errout; +#define SWAP_CHAR(a, b) do { if (*p == a) *p = b; } while (0) + for (char *p = command_echo; *p; p++) { + SWAP_CHAR('<', '\001'); + SWAP_CHAR('>', '\002'); + SWAP_CHAR('"', '\003'); + SWAP_CHAR('\'', '\004'); + SWAP_CHAR('|', '\005'); + SWAP_CHAR('&', '\006'); + SWAP_CHAR('\a', '"'); + } err = read_from_pipe(command_echo, (void **) &command_out, NULL); if (err) goto errout; + for (char *p = command_out; *p; p++) { + SWAP_CHAR('\001', '<'); + SWAP_CHAR('\002', '>'); + SWAP_CHAR('\003', '"'); + SWAP_CHAR('\004', '\''); + SWAP_CHAR('\005', '|'); + SWAP_CHAR('\006', '&'); + } +#undef SWAP_CHAR pr_debug("llvm compiling command : %s\n", command_out); err = read_from_pipe(template, &obj_buf, &obj_buf_sz);