From patchwork Fri Mar 24 12:36:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 74527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp612726vqo; Fri, 24 Mar 2023 06:10:46 -0700 (PDT) Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cov4O4J4 X-Google-Smtp-Source: AKy350Zu5AZRAS2rVT9v4WfHUINUjrqxZZltt97HZ3INLWAqswdUp/xWstVzzm9q7p16jcra7TMv X-Received: by 2002:a17:90a:304:b0:23f:b177:9082 with SMTP id 4-20020a17090a030400b0023fb1779082mr2555695pje.49.1679663446106; Fri, 24 Mar 2023 06:10:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679663446; cv=none; d=google.com; s=arc-20160816; b=Eo2HTMGdR5P3LOF6iRJ6qkhckXgor5CpdccwJxIYa9mqsOaSUu24xD6kQuaqeWuJqG tLTrU+3sRHlejBu8OWPHF7Io+QyUZcA+PjiO2ccMxe7hMqy0Mrve6ZzixqDb/3p5emg+ EwhBF7qJCA74DIn62oR15XFx8uxyn9S4ayYekC8Y8I1K8J6kzwrKQXLXge7ZZvaLXAAc RXuKwIagoQIhSIjfzwkGUaG4/fX65BhSsilgH60AbV7HfXF1gHx/ftV/2Z3he7TKQ/4m in9ZUAiCvrENQqKD87Q0kSj0pbtz4oTxVOvuq0qw2xu6ulc+BJ4t6Jk/pr5nD4kA6zAt NP7g== 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:date:subject:cc:to:from:dkim-signature; bh=qVWlVGSrVn2c+ggXgBm96v9g5NdoleR5x57QldLKszc=; b=UMQC85ffffIaz98LnO0PrMp6egz/LstRc/9DTtrruVK2MLmMWhJzvegWBhuqDNoch7 M8edtu8M7MS8tS/KcxBEyXcr9Bl3f3PusPLvz2JnTxPcSgLpPn61tUge7LcEmMiJuX7J XqulFMyS4MsF6B6u+IjZro0KRExHIhxgYbWB1p7EhNQsbiMm/qWrPV0U+TSrCyO3X+7K wuXa4UYQAG8XVCzYZca9rZINpH9e88iQN29fIGczSQz6fFnAWQ++vo9n5iQwP6oINIFq ZRbMleGRKGqNEesRH4LU4q9Mx0wvzmtdO5egR6h9ok9/uIvgAsGAHhrJv7XOZNpP+6D/ ilqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cov4O4J4; 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 hf21-20020a17090aff9500b002400da5dd18si4325544pjb.57.2023.03.24.06.10.33; Fri, 24 Mar 2023 06:10:46 -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=cov4O4J4; 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 S231539AbjCXMgm (ORCPT + 99 others); Fri, 24 Mar 2023 08:36:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231501AbjCXMgj (ORCPT ); Fri, 24 Mar 2023 08:36:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46D9612CE9; Fri, 24 Mar 2023 05:36:38 -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 dfw.source.kernel.org (Postfix) with ESMTPS id AB25162A91; Fri, 24 Mar 2023 12:36:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43EBAC433D2; Fri, 24 Mar 2023 12:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679661397; bh=wHdqUGeejIKT/uaNZyVOzSQNAwbfI8EP7ra7QHVcAjM=; h=From:To:Cc:Subject:Date:From; b=cov4O4J4ZyGhYF1TegabOXvkxRb939jcOk2Eu5yO3NF0Dubw0QEfMI6xlPkQqqIv3 JECeR74GialtlRzKuJxO+8zVwo6JVWwf+oBjGz8CUohhf8yXEAjgEWahk2d30rc6Hf 2UN+nFuDvhLcqztE/ewY8iJTP5rgsCBRCXnz7j8pilKI93V8+HWdsEYGbAkFNBUZD6 uiU1CYmwQtBSfE9owjtxhIvqej8K/mjFk6USluqolgI1icEo614lYx48G2MiVcVNnl sslXFHKzHV73SWhG9kZeWba3vf/1W6r9FMV7cQ4pR2FbfX0Kbr8TIQYZ3jnwgDwhBU /le61NlrjFI7A== From: Sasha Levin To: torvalds@linux-foundation.org Cc: andrii@kernel.org, mykolal@fb.com, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH] capability: test_deny_namespace breakage due to capability conversion to u64 Date: Fri, 24 Mar 2023 08:36:26 -0400 Message-Id: <20230324123626.2177476-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-5.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS 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?1761254777800920368?= X-GMAIL-MSGID: =?utf-8?q?1761254777800920368?= Commit f122a08b197d ("capability: just use a 'u64' instead of a 'u32[2]' array") attempts to use BIT_LL() but actually wanted to use BIT_ULL(), fix it up to make the test compile and run again. Fixes: f122a08b197d ("capability: just use a 'u64' instead of a 'u32[2]' array") Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/progs/test_deny_namespace.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index b677dcd0b77af..91a4e61b61f6d 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -353,7 +353,7 @@ endif CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ - -I$(abspath $(OUTPUT)/../usr/include) + -I$(abspath $(OUTPUT)/../usr/include) -I$(TOOLSINCDIR) CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ -Wno-compare-distinct-pointer-types diff --git a/tools/testing/selftests/bpf/progs/test_deny_namespace.c b/tools/testing/selftests/bpf/progs/test_deny_namespace.c index 591104e79812e..0a619c34d692d 100644 --- a/tools/testing/selftests/bpf/progs/test_deny_namespace.c +++ b/tools/testing/selftests/bpf/progs/test_deny_namespace.c @@ -4,6 +4,7 @@ #include #include #include +#include struct kernel_cap_struct { __u64 val; @@ -19,7 +20,7 @@ SEC("lsm.s/userns_create") int BPF_PROG(test_userns_create, const struct cred *cred, int ret) { struct kernel_cap_struct caps = cred->cap_effective; - __u64 cap_mask = BIT_LL(CAP_SYS_ADMIN); + __u64 cap_mask = BIT_ULL(CAP_SYS_ADMIN); if (ret) return 0;