Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2167672iof; Tue, 7 Jun 2022 22:00:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWKx/RoCNgTuX5T3Nkbx3dZp4JcTrpNbWMYoWtxCLHPOIv4GYWGYmKn6rukbaGnWtxDlGf X-Received: by 2002:a17:90a:8592:b0:1dd:bab:d286 with SMTP id m18-20020a17090a859200b001dd0babd286mr35785443pjn.143.1654664426325; Tue, 07 Jun 2022 22:00:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654664426; cv=none; d=google.com; s=arc-20160816; b=h+GQS9YpN+698wmLo4o6fm2KY6EQ/mS7dxy+DJWDvjdGpjFi1WnQIUWickkS3MImC3 WUcYaSYr8e05yIv4++JXW1HyyEWoelQ6Go5l3Ts3D/eKrbOAODqef2GuYiEGPCa0vgB0 xt4zWOSVikEvVqU/R2GhRThDedxhl8ZE4LmE4UmTL7SYoWlEVB0sq317I278+A57mNM2 hqce6Z5ukCyuARXUn2FIJRveMRrZkUeirRhSDCETMjt2d3Z7yBW5H1DGz+uFL8RsV6xc 3unMa5lwVINDL708mOrgaN035wSG0q5vPb8UPiG8QvHuqisehl9BP0uTnTi6rZmZy/9Y yJIA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8azzKNts/SLhsGGyBvYLC1ICczJfQWo5zKt8n2Zvjr8=; b=vLHWK99BI+R+hqIuAsqWSgo4hxRYzkC/y6VLer0kG/0usQiX8p0g4rZGtT3eauUiWE WnX+gV0ihv4qB5MP5wJ6JjUHnqMUsSX4s02jQ/uKfWK1Qn5vR06+jCXLbqUEqiOgWmRn cdshxc1zOYLIw7KBR/4UEoRgRRflAwi5fTXzSEtGTpo0ZQBQXvG4TtSdHoDJe2Gf2Wjh b5Y5IDm+CiHC1Nwj6u/e4zyep9wiHZJwKjl5dZ5KqEfDER60d8ohrxI4HFuk9MTNOFnD p3jKes1pVc45lZvzLBdamYj0PN4LMV4WsexQY05mUaynXOiN80zbeSxyAZitkffMbWQC BOgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BmpqtEe7; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id f4-20020a170902860400b0016786f2d1d8si8206015plo.475.2022.06.07.22.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:00:26 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BmpqtEe7; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9ACED24AED7; Tue, 7 Jun 2022 21:29:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381749AbiFGVst (ORCPT + 99 others); Tue, 7 Jun 2022 17:48:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377906AbiFGUvM (ORCPT ); Tue, 7 Jun 2022 16:51:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE8161FD9E0; Tue, 7 Jun 2022 11:40:56 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 68E0CB82399; Tue, 7 Jun 2022 18:40:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDE78C385A2; Tue, 7 Jun 2022 18:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654627254; bh=Xj4t98qVdkLPZQTS7OXQAoSx8M/pu0ePvUGCBZ8pXgU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BmpqtEe7H/iG/zaeu35skaFqOmNEydoBNtgb95gZwZVFtY5WWo5QHECXnKdG5scqf srH5Nq0xcTvkA/TswvlHK8815J38xzFIyfVcbDjv5TtL9d0oMsuuWOJaD8zOYuBg0U srNEVIobWOy5EWDYzdsXVs1ue8nklZ0HHoCzN6mQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= Subject: [PATCH 5.17 673/772] samples/landlock: Add clang-format exceptions Date: Tue, 7 Jun 2022 19:04:25 +0200 Message-Id: <20220607165008.892482355@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164948.980838585@linuxfoundation.org> References: <20220607164948.980838585@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE 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 From: Mickaël Salaün commit 9805a722db071e1772b80e6e0ff33f35355639ac upstream. In preparation to a following commit, add clang-format on and clang-format off stanzas around constant definitions. This enables to keep aligned values, which is much more readable than packed definitions. Link: https://lore.kernel.org/r/20220506160513.523257-7-mic@digikod.net Cc: stable@vger.kernel.org Signed-off-by: Mickaël Salaün Signed-off-by: Greg Kroah-Hartman --- samples/landlock/sandboxer.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/samples/landlock/sandboxer.c +++ b/samples/landlock/sandboxer.c @@ -70,11 +70,15 @@ static int parse_path(char *env_path, co return num_paths; } +/* clang-format off */ + #define ACCESS_FILE ( \ LANDLOCK_ACCESS_FS_EXECUTE | \ LANDLOCK_ACCESS_FS_WRITE_FILE | \ LANDLOCK_ACCESS_FS_READ_FILE) +/* clang-format on */ + static int populate_ruleset( const char *const env_var, const int ruleset_fd, const __u64 allowed_access) @@ -139,6 +143,8 @@ out_free_name: return ret; } +/* clang-format off */ + #define ACCESS_FS_ROUGHLY_READ ( \ LANDLOCK_ACCESS_FS_EXECUTE | \ LANDLOCK_ACCESS_FS_READ_FILE | \ @@ -156,6 +162,8 @@ out_free_name: LANDLOCK_ACCESS_FS_MAKE_BLOCK | \ LANDLOCK_ACCESS_FS_MAKE_SYM) +/* clang-format on */ + int main(const int argc, char *const argv[], char *const *const envp) { const char *cmd_path;