From patchwork Mon Aug 21 13:48:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 136401 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp3041311vqi; Mon, 21 Aug 2023 07:27:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHyZpRH6yLKSphZf+2lm6z1P9iyLgsbgZ0hFIeHvtMVukrIWyaxHuXhkVWqrRTDPxOyqX5Y X-Received: by 2002:a17:906:304e:b0:9a1:b05a:c07c with SMTP id d14-20020a170906304e00b009a1b05ac07cmr22488ejd.55.1692628028736; Mon, 21 Aug 2023 07:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692628028; cv=none; d=google.com; s=arc-20160816; b=N/rSWvwWymrxY78Dp7n4ZfVSLE/Nxt+ZGKN6L+dMRcoRePlLmCYNXv3VSUk3Qm5hsW 1Z2AAHs1tV/1o4+E7I5Ds/lLNpHTSGCiRNhs78hBTBECUuPCs0GPUIktuVun8fJsv0Ic KCs8vpYevni77zYLY+h50Hcu5fIzz/XgJxs3VN7GBJ5U/fZk7VjV3O8EYWLjb7Dl3K/9 ElfpdZQK6DGkguAY3HunUBuMqGNuXhIbh/JSn1ge8lbNrJfyrmjnrHdUA0YohX1uAX98 ZQizD9Zj0ODncJWbOX2vjMO2Mxmgvl52FJrXnHD/R9w56eK48rIkMNDNR9m1z0ibO7QE 2IWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=8c24iyydmjV5C1lkKm6JkLRUWjde+W1DkuA84b3/sc0=; fh=cMzfCi/fdV7VF10d5epYQjsgP/HnGYh1tMYzjbZVrcw=; b=Gq+9Vuop7YWfRAcdkXsGDVCjuG1b6t6QuxZq3FSZAPTd2K8M0nyQHsKrqszY7pi5PV vIx7PMzjifJToF9sg0bLQQ2EDMVsRsa0GJwZqscFzPqxKEjwk5qWhiEy/BS4AQiLVaYD jhOKpoGEhnwhuRgaPdcL1y+pka1Es8eCw3P34HpBv/LZVtmaUv6UgGVxFnWCm5J/tcMp dqVmUf7cUmi2mzoxCNpwIPMAJphi2i7apmwvbC25s4WnfCKuxQ8tst15ahsNkd89RMz4 950gjopbzvtiCl3iDrR2LWb+B/4dEsNV6jvPAd7AVyTrgRo2OXv4FVXZFr49O7wcgRnl M0qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=S+TZr9eY; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y9-20020a170906070900b0099b7a166dccsi5561335ejb.308.2023.08.21.07.26.43; Mon, 21 Aug 2023 07:27:08 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=S+TZr9eY; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235505AbjHUNsw (ORCPT + 99 others); Mon, 21 Aug 2023 09:48:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235093AbjHUNsv (ORCPT ); Mon, 21 Aug 2023 09:48:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A194BC for ; Mon, 21 Aug 2023 06:48:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0FE1F63786 for ; Mon, 21 Aug 2023 13:48:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46F37C433C8; Mon, 21 Aug 2023 13:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692625729; bh=gD518kNrvUu4+K4e0YMv450TTE2x5VU7KtXDuYQpHeM=; h=Date:From:To:Cc:Subject:From; b=S+TZr9eYhTTFyzbilTUMacxqROvfo/MEu/vGW8S+P5fAd3jqf8BjZJ7FAx1WxLDNE Pl7lWz5PglZ7kz4Mjn6mAGh+g/C8YCaFkgFlZayf/GOyQXxviT8wuTFu1G9ODdqfVT xpAK9aoiV0RwaLSIDf77G80F6dSiHeOf7/lpbSCDAiZPlj/RbJsxFhu1YpbWLc24ZP JspIGaSaDUVEdzyT510xGzDV+gTWxl+zgbnUYkmSEI7JIErZ72yd+ZAr52bICVAiuo b4K0MT08o1lNA2/3xnw0Guhoq/fRa03o5EoIMOPClBqPjyoY2ADr+6X5NWnU7C+p5v rRS/KPB1OHWSg== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id EC22140722; Mon, 21 Aug 2023 10:48:46 -0300 (-03) Date: Mon, 21 Aug 2023 10:48:46 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Adrian Hunter , Jiri Olsa , Namhyung Kim , Linux Kernel Mailing List Subject: [PATCH] perf bpf augmented_raw_syscalls: Add an assert to make sure sizeof(augmented_arg->value) is a power of two. Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: INBOX X-GMAIL-THRID: 1774849127558886537 X-GMAIL-MSGID: 1774849127558886537 Similar to what was done in the previous cset for sizeof(saddr), we need to make sure sizeof(augmented_arg->value) is a power of two to do bounds checking using &=: augmented_len &= sizeof(augmented_arg->value) - 1; Suggested-by: Ian Rogers Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c b/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c index 43549b63b433d81e..90ce22f9c1a94004 100644 --- a/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c +++ b/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c @@ -160,6 +160,7 @@ unsigned int augmented_arg__read_str(struct augmented_arg *augmented_arg, const */ if (string_len > 0) { augmented_len -= sizeof(augmented_arg->value) - string_len; + _Static_assert(is_power_of_2(sizeof(augmented_arg->value)), "sizeof(augmented_arg->value) needs to be a power of two"); augmented_len &= sizeof(augmented_arg->value) - 1; augmented_arg->size = string_len; } else {