From patchwork Thu Feb 16 19:45:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 58218 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp495443wrn; Thu, 16 Feb 2023 11:48:38 -0800 (PST) X-Google-Smtp-Source: AK7set9kjnfcmyliouD2PJtMduy+eVN0Ar914fMn9CaCOjQE1/ddjKWxzNNXkPupAvuRkpfAitS/ X-Received: by 2002:a17:902:e742:b0:19a:96ea:3850 with SMTP id p2-20020a170902e74200b0019a96ea3850mr3274212plf.17.1676576918390; Thu, 16 Feb 2023 11:48:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676576918; cv=none; d=google.com; s=arc-20160816; b=kEmZXpHgQzzCy+0RGtiHsK461+/FV+5Nm0QtqdT0/WzH5+oorbqZ+FxhxN+hrHgUyT BJwzDJjYe9oflYm3Fzg1+tE2AlGcQFCKienq/kHgN6j4jwYjeUQegs+KDS/uUGbpXyYV dO3kJ5C1SJ8FtBqRY+JkM3twO3AxFzhTnS7lj83Z1D8CxR01V/I7yfKiKCfSSk70ZX/C bRXTDDxm/eNie8yI9KCwk7Eq1i7j3qk92hBAByxkqKQQjxVmUs5qL+a2sOLDR361tV+F DKinDVhO+yFLNSlS5xPIrFs3W+e5WiXNgiW7YC/Xl+Ymv/+QsklK78o9dtLs9e3PrWAR 7uhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:subject:cc:to:from:date; bh=P4+ELEaco4vFIIRLZrggTdxSTDPwW8JvSgd+P4DJCf8=; b=tXWcAPKhSydCuD/RcNlwxGmBhExwZ45H04JY5aWGR4FGjQNaxV0iIYkuiaFhj8f/sf MBTKICBnupCVG28B6y7a/DMC/SJMr8WaH31T3zf680Y25/MoKMwwUCTk14+bZEgXOEgJ L7wSUSPCmMSoT5fQX5Zks94KXdaItabYHA08DYVZ9jy+rPxC/ZeukHGseZlpI/oV7ZID aqR444ei6XlSUNK5DQgU398b0MFN1Ptk5DMgHLsJbT+KpwUntpokgr4bQJTyDAPw2iP0 9sYUWp/WoWHBPh0CWYEVcOj+KJYwIERtWE/2j7+DBpM3V9V0p0ITebnWkwrMSHESxLwR fGMw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u17-20020a170902e81100b001992166cd71si1746131plg.109.2023.02.16.11.48.25; Thu, 16 Feb 2023 11:48:38 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229678AbjBPTp0 (ORCPT + 99 others); Thu, 16 Feb 2023 14:45:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjBPTpY (ORCPT ); Thu, 16 Feb 2023 14:45:24 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EFA550349; Thu, 16 Feb 2023 11:45:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2A9F260ACA; Thu, 16 Feb 2023 19:45:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61D52C433EF; Thu, 16 Feb 2023 19:45:22 +0000 (UTC) Date: Thu, 16 Feb 2023 14:45:20 -0500 From: Steven Rostedt To: LKML , Linux trace kernel Cc: Masami Hiramatsu , Tom Zanussi Subject: PATCH] tracing: Add BUILD_BUG() to make sure stacktrace fits in strings Message-ID: <20230216144520.07f4aebf@rorschach.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1758018318724798863?= X-GMAIL-MSGID: =?utf-8?q?1758018318724798863?= From: "Steven Rostedt (Google)" The max string length for a histogram variable is 256 bytes. The max depth of a stacktrace is 16. With 8byte words, that's 16 * 8 = 128. Which can easily fit in the string variable. The histogram stacktrace is being stored in the string value (with the given max length), with the assumption it will fit. To make sure that this is always the case (in the case that the stack trace depth increases), add a BUILD_BUG_ON() to test this. Link: https://lore.kernel.org/linux-trace-kernel/20230214002418.0103b9e765d3e5c374d2aa7d@kernel.org/ Signed-off-by: Steven Rostedt (Google) --- [ Note this is on top of: https://patchwork.kernel.org/project/linux-trace-kernel/patch/1ed6906cd9d6477ef2bd8e63c61de20a9ffe64d7.1676063532.git.zanussi@kernel.org/ ] kernel/trace/trace_events_hist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index f21e42ddba69..6cef1def1da5 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -3119,6 +3119,9 @@ static inline void __update_field_vars(struct tracing_map_elt *elt, unsigned int i, j, var_idx; u64 var_val; + /* Make sure stacktrace can fit in the string variable length */ + BUILD_BUG_ON((HIST_STACKTRACE_DEPTH + 1) * sizeof(long) >= STR_VAR_LEN_MAX); + for (i = 0, j = field_var_str_start; i < n_field_vars; i++) { struct field_var *field_var = field_vars[i]; struct hist_field *var = field_var->var;