From patchwork Tue Jul 6 17:54:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9839C07E96 for ; Tue, 6 Jul 2021 17:54:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A052A61C44 for ; Tue, 6 Jul 2021 17:54:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229949AbhGFR5V (ORCPT ); Tue, 6 Jul 2021 13:57:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229787AbhGFR5V (ORCPT ); Tue, 6 Jul 2021 13:57:21 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4268C061574 for ; Tue, 6 Jul 2021 10:54:41 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id hc16so35505100ejc.12 for ; Tue, 06 Jul 2021 10:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=h2Pt8JnW2D+pveT6afpanrEwrxDiu7/G5JngJ3+BvHA=; b=pi9ipwEuO9V7q74twnTt2X+5qVdlXESnSXgef60zBCOxCBzkCmoZD93PPVPBl/x5AW k7Z54ssne61ajocmNK26h+rsd1nzLNAetkL0+fENHDwwu1xCkVeDwGwcEE0/IUluCanW wNvtOxNLWZa8PN7pSUBObEmcNstWWfiXr+MpA8/jugNdpra17HKb3dGgG4oiP8lvN5rE Ofh/W61TA7Ri3E1nmU6SAZ79Hsb3q9L+ToOm0WpomOWdbufW4XP9SpBQQMV8EfJXd417 YEyt/5DZojj/KkteUNugn/Kf39PErMsHHnasOPzJ9AqjrdNXXuFo3sHOY7RLFmqpb4k8 9GBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=h2Pt8JnW2D+pveT6afpanrEwrxDiu7/G5JngJ3+BvHA=; b=lU1eX/2R7SKDNLoQTA7gwkZUbp1oOTeY2Yi+Q6elUokDrjlBKG24kSq0J1/4PdX3Gs FHJZ4zws23sgyHBDFknASRI2F/BQ/OKqJ/McQLy0ITKKJfYEG3pR4wgNFOHyOyvtS6JY mIF6o2e4iDE11kPrppGYOo0/PJQbY5isDYj8Cp3uBeqZa2Nbg2WspnT0gsrLrZbSZvry Y5reM9Fwu7xu5qX0TAxiO1pI2nSrfxiqQpa6udfbEurz0EDed9LwZwKy8MeTUqY5E+V8 OVzDE5JG/BNa0bLKPiszeRfJAVaeEger5bUANfeWy7ps7TCTc7qrM0a6TchAiVOhuWNV GBAw== X-Gm-Message-State: AOAM530b61srRDYp8j6En2dHI+ydeQWt1wP0A58IIwo2AfcrCNdhzOp6 GumiWM8hVhXVikUTwI+ShQfvO33Elgo= X-Google-Smtp-Source: ABdhPJzsXIX1e/XkQTqbcy+uAP6gD/hN/7gVWnrICqFOuJ8aPEXcFf4RLaYcDeMSRZbB6ny3epbLQQ== X-Received: by 2002:a17:907:728e:: with SMTP id dt14mr19779370ejc.75.1625594080276; Tue, 06 Jul 2021 10:54:40 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:39 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 01/13] checkpolicy: pass CFLAGS at link stage Date: Tue, 6 Jul 2021 19:54:21 +0200 Message-Id: <20210706175433.29270-1-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Pass CFLAGS when invoking CC at link time, it might contain optimization or sanitizer flags required for linking. Signed-off-by: Christian Göttsche --- checkpolicy/Makefile | 4 ++-- checkpolicy/test/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkpolicy/Makefile b/checkpolicy/Makefile index 0d282ef9..be63c018 100644 --- a/checkpolicy/Makefile +++ b/checkpolicy/Makefile @@ -30,10 +30,10 @@ all: $(TARGETS) $(MAKE) -C test checkpolicy: $(CHECKPOLOBJS) $(LIBSEPOLA) - $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA) + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA) checkmodule: $(CHECKMODOBJS) $(LIBSEPOLA) - $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA) + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA) %.o: %.c $(CC) $(CFLAGS) -o $@ -c $< diff --git a/checkpolicy/test/Makefile b/checkpolicy/test/Makefile index 89e7557c..e2a332b5 100644 --- a/checkpolicy/test/Makefile +++ b/checkpolicy/test/Makefile @@ -13,10 +13,10 @@ endif all: dispol dismod dispol: dispol.o $(LIBSEPOLA) - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA) dismod: dismod.o $(LIBSEPOLA) - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA) clean: -rm -f dispol dismod *.o From patchwork Tue Jul 6 17:54:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97D75C07E9B for ; Tue, 6 Jul 2021 17:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7807A61C44 for ; Tue, 6 Jul 2021 17:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230222AbhGFR5W (ORCPT ); Tue, 6 Jul 2021 13:57:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229787AbhGFR5W (ORCPT ); Tue, 6 Jul 2021 13:57:22 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EA1DC06175F for ; Tue, 6 Jul 2021 10:54:42 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id ch27so2767641edb.10 for ; Tue, 06 Jul 2021 10:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GXzSwc3kOjwrGoieF8dJoOtvkZdbaczvdd+y7gCnqgA=; b=Kjgk5TfSNcOtr5DhYPV65HaJEdlLZDSHybMA3yR9fBP5f41+1E10F4ChMuxrwuQyA1 Aeb8/hVdBVVLBWdWAdRbI92IjtD4uV9SkQUHTswtOmoCmMVIbRV6RKm/SOyXrf/1y22e 8ptpkK1I/MPElcbnXR289Mx0FufpwMlMpmKe2zEz9/maJZCDMEDEaL8FSzxY4q7/xEXH yCbKydYcwIIlY9MobTXcpS2k+JO/lVnUu6RJeFoqYUiyddQ47p7yfdZQ4y8bcJfe8wNJ IBDtB+RfrIQhpG1mKMwXGxlFbYMMXNsN6SFOphYnG7upAJvNr/Jedmk97IrACphr4yEk /lGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GXzSwc3kOjwrGoieF8dJoOtvkZdbaczvdd+y7gCnqgA=; b=QWxFpI3662QUOkNTfCvAiDA66zex749fsAX83iCnAnUBhZoDsCZZ9TFJBQONo0RgQH 1nEDGqfwkXHLiQ2xjAGETwrtmU8lZ4gFX67Mfz9m2+g3UZVI6hpo+aUvOZpSUxC1FpLI DoqAuu0PuXW0VFB9xWA68HfKcdd7jg0vCXKtQMzoAJIHYMsXj5E3cJwztuNivEVEPDeM oKltZ4k9Gij+p68h7L7e8iyPbt5HKhfXAwQlyxoozOwkMXxnBToDUDWAJCp5+pnQJdwR hy8QzEDgOMq5bffb/f23+tv2kVXTlK0hLCQCpwW9XBz3KVu4U9g2BnBv7R+u5ld0V+r5 +Spg== X-Gm-Message-State: AOAM532PNyKe2jcuFU3BrHVuNX2khm/Eo4we59EvXxzA+fCSQb5T6zmJ UNDjamKx9iRi8jPiwCHFQUZOb2jvAOg= X-Google-Smtp-Source: ABdhPJzp8zRj4+t95Pp8T1lhuyRJG1z9q99xvQY9g41e8e3A9iWRVMOkNojr5t96/pcK7SRyVV74zw== X-Received: by 2002:aa7:dbc8:: with SMTP id v8mr24415104edt.242.1625594080821; Tue, 06 Jul 2021 10:54:40 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:40 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 02/13] checkpolicy: drop -pipe compile option Date: Tue, 6 Jul 2021 19:54:22 +0200 Message-Id: <20210706175433.29270-2-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The compiler option -pipe does not affect the generated code; it affects whether the compiler uses temporary files or pipes. As the benefit might vary from system to system usually its up to the packager or build framework to set it. Also these are the only places where the flag is used. Signed-off-by: Christian Göttsche --- checkpolicy/Makefile | 2 +- checkpolicy/test/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpolicy/Makefile b/checkpolicy/Makefile index be63c018..f9e1fc7c 100644 --- a/checkpolicy/Makefile +++ b/checkpolicy/Makefile @@ -10,7 +10,7 @@ TARGETS = checkpolicy checkmodule LEX = flex YACC = bison -y -CFLAGS ?= -g -Wall -Werror -Wshadow -O2 -pipe -fno-strict-aliasing +CFLAGS ?= -g -Wall -Werror -Wshadow -O2 -fno-strict-aliasing # If no specific libsepol.a is specified, fall back on LDFLAGS search path # Otherwise, as $(LIBSEPOLA) already appears in the dependencies, there diff --git a/checkpolicy/test/Makefile b/checkpolicy/test/Makefile index e2a332b5..8e5d16b3 100644 --- a/checkpolicy/test/Makefile +++ b/checkpolicy/test/Makefile @@ -1,7 +1,7 @@ # # Makefile for building the dispol program # -CFLAGS ?= -g -Wall -W -Werror -O2 -pipe +CFLAGS ?= -g -Wall -W -Werror -O2 # If no specific libsepol.a is specified, fall back on LDFLAGS search path # Otherwise, as $(LIBSEPOLA) already appears in the dependencies, there From patchwork Tue Jul 6 17:54:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A165FC07E9C for ; Tue, 6 Jul 2021 17:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8485061C3C for ; Tue, 6 Jul 2021 17:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229787AbhGFR5W (ORCPT ); Tue, 6 Jul 2021 13:57:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230015AbhGFR5W (ORCPT ); Tue, 6 Jul 2021 13:57:22 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC178C061760 for ; Tue, 6 Jul 2021 10:54:42 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id v1so1029017edt.6 for ; Tue, 06 Jul 2021 10:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=e7Zc/A3tC6K8Oj6n+eRJnmhAokCQ1P/4q9JUXZAfPjs=; b=aFEubR5W17BCIvvrZCdCzjqlod1rVPro4cWK1CMUbGEotp7ifN8M1s4ThTQZca7LQ5 9V5g4og34BtsNR9pt1T0gdal8/buLRewkOZGh0ikdNR+75ecaxuhBKaqrs+oNjnxfrI3 2WrBUwiPG+I8/dezevOfuiFVFhZRNzKD7hxhDg1qU6i9PV2FlO/s/Y84rFadDVmqCNLM liff7CY6KMTcwUxQtryD35ftyhIZHlUe22dovcJIXawqn8FLoJ4MZ52Jn3HsifEvk4tb zVSjs3D9DWUJficvuWpuOphNbha/2WwHeEr3zxpjaKB66Sg7ph4L5+lvilenc3CTXSNx yMhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e7Zc/A3tC6K8Oj6n+eRJnmhAokCQ1P/4q9JUXZAfPjs=; b=Ml2KFWtsHwh4VWDa2hBmXTeAbudRPpxnNpwoNTOwaoZMk/grPo8G2Ahv7B9YrI3a9k N9OMf4v1MHT7EvmkRRqIAkxUmVHHFh9ayagTnznbXkfMbAEb0JUCgqEbSjCC4HBMFKT2 diko+miBZju9hPcpzHvzrcB3JXRaFYLJpICFJRp7jjK6HN8su9ewNkl7gTe07UtVg+7g LciRzJKeUuAWkQjdXSXm38vDjS/cb/ioc009emi6MuiArH2xfcZwXknq0ZII6dph584/ zaoCMcJq/C0o1aGUEf//iyKOpEeEpE8PGUlza7bqLGsDMPJVeEHlQXs4+PkqhXPWoD1H D46Q== X-Gm-Message-State: AOAM533ZhK61E0ficaMxbwadQYnRSoSfnXCyJ05rEw96KM1gtqD1kY3k LlTHTLX0TwuIbKxN7WKqszT/ZXKsQx4= X-Google-Smtp-Source: ABdhPJwqGC19N2UGdTpqudGVfMJciF1dG/mMnHiTitR89pFmltcuQsDC0xWNVEygTzYlqOcbZ/TFQg== X-Received: by 2002:a05:6402:18eb:: with SMTP id x43mr13737605edy.98.1625594081374; Tue, 06 Jul 2021 10:54:41 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:41 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 03/13] checkpolicy: simplify assignment Date: Tue, 6 Jul 2021 19:54:23 +0200 Message-Id: <20210706175433.29270-3-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org checkpolicy.c:504:20: style: The statement 'if (policyvers!=n) policyvers=n' is logically equivalent to 'policyvers=n'. [duplicateConditionalAssign] if (policyvers != n) ^ checkpolicy.c:505:17: note: Assignment 'policyvers=n' policyvers = n; ^ checkpolicy.c:504:20: note: Condition 'policyvers!=n' is redundant if (policyvers != n) ^ Found by Cppcheck Signed-off-by: Christian Göttsche --- checkpolicy/checkpolicy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c index acf1eac4..9627275f 100644 --- a/checkpolicy/checkpolicy.c +++ b/checkpolicy/checkpolicy.c @@ -501,8 +501,7 @@ int main(int argc, char **argv) usage(argv[0]); exit(1); } - if (policyvers != n) - policyvers = n; + policyvers = n; break; } case 'E': From patchwork Tue Jul 6 17:54:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D291DC11F66 for ; Tue, 6 Jul 2021 17:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9D4561C44 for ; Tue, 6 Jul 2021 17:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230015AbhGFR5X (ORCPT ); Tue, 6 Jul 2021 13:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230082AbhGFR5W (ORCPT ); Tue, 6 Jul 2021 13:57:22 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63345C061574 for ; Tue, 6 Jul 2021 10:54:43 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id bu12so35629472ejb.0 for ; Tue, 06 Jul 2021 10:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=v23z/5GoWAZhN2MjQlwfVIQFvhkXRPQPRvLEnxTFbcw=; b=X2YAZRWvy8Y3s07xY8qOGwmGsEDR4RLXIY1CarMhcS1YSf79/32EtzVhe6GDFv56bI MJ3JqNmZWRZuv7K9m5L765QDjA1F+5uqwT/lS0srcuPp710lk/HSTtVuohvdkFT2inJ1 icrLW6QhsY/V2Rb+orx5ixO5DZS25KeYDjd09BV98kPC6PdMow6S0tIZWOXXG7Ccvw3D FozbxvO0LKTnqTDieO27RKRMdkGcUUBCHl42erqroawGwiolm/oBb0W+M04LuCfxvA5T XtNynEDcDkxpdc2GDnByryWSfOYt/WOe/t6Rr1SvR/Isk16wKU+2XktVRhM/w00yzLfq IJxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v23z/5GoWAZhN2MjQlwfVIQFvhkXRPQPRvLEnxTFbcw=; b=b2QFNzpW2F0mh7WRr9h0bjmOv1px+hqgao2vn4vRUpHHsUScLxfmx6/58KdGgUNr6s 8kjI0CDP+RIJiNxtWjty+4f0etryIvRqY6WfyrQ2/D9Z6RJxbpmYmXmFqN3VBJNaDtjY PlZ8Fjr8tzaW1ejf/ET+OeuTDE3+zFEj7xxQuUZgFCRErZIY1SKOyyKPaUCHvougS10a IzOeTsBX8xrMVfnyWvo3WIn4vBoLCpT4CzL9gyMy9ffzTIrc37g29IbLkNncf5GNAyrf x6f+G1MEomhi4KcYOQ2yg0XKafD99Hkkt9aZV3iSuGUNwg2PvWA+Znm4+JX0hWLRo2IY 7DYg== X-Gm-Message-State: AOAM5310QWVf+Dcwou/g0AwvDhmDBlykLM4K55rwedorZbf8Vge4hjxH BdkUHqiCH70G6IKBALBu1yOurnSW7WY= X-Google-Smtp-Source: ABdhPJx2lC8x6a/8uhp5sfWBRnOkjpXP/wpTn3MVHmyQdc7x62iHX2u3m6kvLo9En5wXHs1Ev0dV7Q== X-Received: by 2002:a17:907:94ca:: with SMTP id dn10mr19929645ejc.431.1625594081909; Tue, 06 Jul 2021 10:54:41 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:41 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 04/13] checkpolicy: drop dead condition Date: Tue, 6 Jul 2021 19:54:24 +0200 Message-Id: <20210706175433.29270-4-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The variable `id` is guaranteed to be non-NULL due to the preceding while condition. policy_define.c:1171:7: style: Condition '!id' is always false [knownConditionTrueFalse] if (!id) { ^ policy_define.c:1170:13: note: Assuming that condition 'id=queue_remove(id_queue)' is not redundant while ((id = queue_remove(id_queue))) { ^ policy_define.c:1171:7: note: Condition '!id' is always false if (!id) { ^ Found by Cppcheck. Signed-off-by: Christian Göttsche --- checkpolicy/policy_define.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c index 16234f31..7eff747a 100644 --- a/checkpolicy/policy_define.c +++ b/checkpolicy/policy_define.c @@ -1168,11 +1168,6 @@ int expand_attrib(void) ebitmap_init(&attrs); while ((id = queue_remove(id_queue))) { - if (!id) { - yyerror("No attribute name for expandattribute statement?"); - goto exit; - } - if (!is_id_in_scope(SYM_TYPES, id)) { yyerror2("attribute %s is not within scope", id); goto exit; From patchwork Tue Jul 6 17:54:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05C3EC07E9E for ; Tue, 6 Jul 2021 17:54:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2DCB61C3C for ; Tue, 6 Jul 2021 17:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230082AbhGFR5X (ORCPT ); Tue, 6 Jul 2021 13:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbhGFR5W (ORCPT ); Tue, 6 Jul 2021 13:57:22 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F282EC06175F for ; Tue, 6 Jul 2021 10:54:43 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id ch27so2767742edb.10 for ; Tue, 06 Jul 2021 10:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=P4Aiz6aw5htaYbHyxgXtTHKQ+qZhc6sA3FUyO23yQQ4=; b=OJm1wIgDGPyLLdaS5IZQxVPevxSuKNONirNm84BL4WuLFlR0+3m98WloLYoktlxn5c cSULeD1Utq2hxsEGE8aTTyA91kHybUKSiYVUJ1c6SUZkO5aBCZCKHOPWcU7pTQwSnoqv BNdZZ8HjxSYpYq9fd1mYQuzj+to8/9zDSDy+dbw0EvMLnTR8wdcV5U3HSM/9DQNBwCFy ahDeIAHR9YoQ43RluSzFDVlVI4Rsx2p167vsI7Jvyj2RVaVlTDA7pD/dIGmvjiaKAruE a5J44DaQCIDf/YzxKwN4JwO2yKlBGVe6DoxvhXH2/+OYhp++9AwUyT+/m3xQHKLpsgSK QDFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P4Aiz6aw5htaYbHyxgXtTHKQ+qZhc6sA3FUyO23yQQ4=; b=nnpEySVl5zVBPy7jPKr8cFRTZVqA22HQhs48J5PIsKXEwZbaS40xe/BtWmmbBxfueh +ZVZDby11fUzD5FlbmMbyc3frJsZSzk/r77djp6jKiK2RJ4tKe1q1Rm2bVAlItiyNzlX hg9d2mvtJJ3yLnVR6zOhi/aPfjp4tWB4WJZpIi8B/9BdoUWVZiTonUzLhtKMK+jh0WFq jNCr4M+eDnAdvtS2BVng2IlSt8tQdpr6BIo1j9uG6NWkph2p6ddo1RjtoxKyDDs/lAak kGHCHdwbecARMc/1Pz5sdR0s2WchH9zaCBjD2OpEe4NZlo1MsSfg6ADG5YFRQvIFU5Ul 93Tg== X-Gm-Message-State: AOAM5316KF7hh5pm3H7T2cD3kY9bPqc0P5LAvcdT+E0jN1WMc1yhm204 I4yrDvW/q4+Y8oVWIBlqwZ8wu6aL6+Y= X-Google-Smtp-Source: ABdhPJw9d1ml7L3UXJ84C5nPyXatIz1/7sXTP2cF9Y+NQ0TXBREZ0tA/4yGhqjGC3emRWkfb4pvTgA== X-Received: by 2002:aa7:cb84:: with SMTP id r4mr24211085edt.205.1625594082500; Tue, 06 Jul 2021 10:54:42 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:42 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 05/13] checkpolicy: use correct format specifier for unsigned Date: Tue, 6 Jul 2021 19:54:25 +0200 Message-Id: <20210706175433.29270-5-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org test/dispol.c:288:4: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] snprintf(buf, sizeof(buf), "unknown (%d)", i); ^ test/dismod.c:830:4: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] snprintf(buf, sizeof(buf), "unknown (%d)", i); ^ Found by Cppcheck. Signed-off-by: Christian Göttsche --- checkpolicy/test/dismod.c | 2 +- checkpolicy/test/dispol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c index 3408e9b6..fadbc8d1 100644 --- a/checkpolicy/test/dismod.c +++ b/checkpolicy/test/dismod.c @@ -827,7 +827,7 @@ static void display_policycaps(policydb_t * p, FILE * fp) ebitmap_for_each_positive_bit(&p->policycaps, node, i) { capname = sepol_polcap_getname(i); if (capname == NULL) { - snprintf(buf, sizeof(buf), "unknown (%d)", i); + snprintf(buf, sizeof(buf), "unknown (%u)", i); capname = buf; } fprintf(fp, "\t%s\n", capname); diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c index 8785b725..37f71842 100644 --- a/checkpolicy/test/dispol.c +++ b/checkpolicy/test/dispol.c @@ -285,7 +285,7 @@ static void display_policycaps(policydb_t * p, FILE * fp) ebitmap_for_each_positive_bit(&p->policycaps, node, i) { capname = sepol_polcap_getname(i); if (capname == NULL) { - snprintf(buf, sizeof(buf), "unknown (%d)", i); + snprintf(buf, sizeof(buf), "unknown (%u)", i); capname = buf; } fprintf(fp, "\t%s\n", capname); From patchwork Tue Jul 6 17:54:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361023 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B285C11F67 for ; Tue, 6 Jul 2021 17:54:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BD3B61C44 for ; Tue, 6 Jul 2021 17:54:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230293AbhGFR5X (ORCPT ); Tue, 6 Jul 2021 13:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbhGFR5X (ORCPT ); Tue, 6 Jul 2021 13:57:23 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71CC3C061574 for ; Tue, 6 Jul 2021 10:54:44 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id m17so7584261edc.9 for ; Tue, 06 Jul 2021 10:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1MEIpjRB+BUPTBDiEods8jPK/TxPB9V/ZU1g8xBx+7E=; b=RyJKhjM/+zTus/ha0MXE3onpAvg8fcvLTCqFN9lHRKlzXe36BWUHxGpWjRv3Uh2pGH 02fG703E/MewlRiFYxiRlkiXKqQG/i8mueowzPD2WoUJUKY8u2s7Ss6z9PIRUUbdbJEa VLPuArQo6V1vdKTMom9xTGstYAeEnan9P15XK0ucPoEkQK66muEDzFy8EHm29pNoNIop ZbOV1WYXuZ5pCK9SMuu6p0jVjr8u9pIEI1gi6duYNCUK6jdLDHNm9GaC/hveDSm6/nO4 bIuS+3hZNndqtas2QedoohFB2zKmZOLpzfjdm5zwIzp0pVpVOinYgQ8Kyo8BWfHdX5Ls Au1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1MEIpjRB+BUPTBDiEods8jPK/TxPB9V/ZU1g8xBx+7E=; b=RTv39AtFmye+xDfL492Zm2RIgHSXEKhL19yvO7a5oIrcdhW5oe7Q9ZmkaEHDTApUcb CjIsSV6ILbc7UvtqgP2svkJHKiJL2YLynPEMb31PRoaJwOMECv77PQI81ewSIfI6PDtE FA1q2WlVQJpz5xvbk9+TojQMG0myR7E1EDdhTig/i+98ongKZOYMWk+E+eupNpfXUXCg jRc+8hntZJoiUsl/Ja+EYTRFUlapOfvnIeu/VYK7451costq2eTXjXJetvWnFvxxM9ew Jw2ENTFkZi7Yp5SvizsmOpu7aVdlVDbIN4XrUgxBikaQq1O5PCO/HaPSDQdluPsg/hsU OMlw== X-Gm-Message-State: AOAM530F49bS1K8NbxheDy6/ZayUSSAzE8fEFr77AKjOMtxVphM8cfLq G9jkeWNkcgNQHXUnfgwtbsBeERuy0Ic= X-Google-Smtp-Source: ABdhPJyzACE/ntnKxM/HW66ey4tKNTStLTNtFCrt3GOOclhlpBgP3WiBOKiVZGg2Jl6xtx//yYMxDA== X-Received: by 2002:a05:6402:40c3:: with SMTP id z3mr23835051edb.375.1625594083103; Tue, 06 Jul 2021 10:54:43 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:42 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 06/13] checkpolicy: follow declaration-after-statement Date: Tue, 6 Jul 2021 19:54:26 +0200 Message-Id: <20210706175433.29270-6-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Follow the project style of no declaration after statement. Found by the GCC warning -Wdeclaration-after-statement. Signed-off-by: Christian Göttsche Acked-by: Nicolas Iooss --- checkpolicy/checkmodule.c | 6 ++++-- checkpolicy/policy_define.c | 3 ++- checkpolicy/test/dismod.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/checkpolicy/checkmodule.c b/checkpolicy/checkmodule.c index 40d0ec99..316b2898 100644 --- a/checkpolicy/checkmodule.c +++ b/checkpolicy/checkmodule.c @@ -288,14 +288,16 @@ int main(int argc, char **argv) } if (policy_type != POLICY_BASE && outfile) { + char *out_name; + char *separator; char *mod_name = modpolicydb.name; char *out_path = strdup(outfile); if (out_path == NULL) { fprintf(stderr, "%s: out of memory\n", argv[0]); exit(1); } - char *out_name = basename(out_path); - char *separator = strrchr(out_name, '.'); + out_name = basename(out_path); + separator = strrchr(out_name, '.'); if (separator) { *separator = '\0'; } diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c index 7eff747a..22218c07 100644 --- a/checkpolicy/policy_define.c +++ b/checkpolicy/policy_define.c @@ -1904,8 +1904,9 @@ int avrule_read_ioctls(struct av_ioctl_range_list **rangehead) { char *id; struct av_ioctl_range_list *rnew, *r = NULL; - *rangehead = NULL; uint8_t omit = 0; + + *rangehead = NULL; /* read in all the ioctl commands */ while ((id = queue_remove(id_queue))) { diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c index fadbc8d1..b1b96115 100644 --- a/checkpolicy/test/dismod.c +++ b/checkpolicy/test/dismod.c @@ -697,8 +697,8 @@ int display_avblock(int field, policydb_t * policy, { avrule_block_t *block = policydb.global; while (block != NULL) { - fprintf(out_fp, "--- begin avrule block ---\n"); avrule_decl_t *decl = block->branch_list; + fprintf(out_fp, "--- begin avrule block ---\n"); while (decl != NULL) { if (display_avdecl(decl, field, policy, out_fp)) { return -1; From patchwork Tue Jul 6 17:54:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361027 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4EC3C11F69 for ; Tue, 6 Jul 2021 17:54:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 976E761C44 for ; Tue, 6 Jul 2021 17:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230247AbhGFR5Y (ORCPT ); Tue, 6 Jul 2021 13:57:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbhGFR5Y (ORCPT ); Tue, 6 Jul 2021 13:57:24 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09241C061574 for ; Tue, 6 Jul 2021 10:54:45 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id h2so29212239edt.3 for ; Tue, 06 Jul 2021 10:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=oav1PeRGPMZWIm7UG7Np40qqDwAtjIlXIG+x9/XHnYo=; b=JXZcUQi6qz9Y9IR+CLJ2fprBQaZjo0FQvhrsAOHEztk26HCd2dQOs07oyHtiobi5GF vZ/3jNRiEGlUf1nK44il+1HtyhPTVOa5X0IH6lajE0rI6pArXsmw+nXJrGcpoGfKy78i vVKQjzo2hCQHlvZrNig8/EW/KerLDjveHTcIZeDctHLvnxeCzRtC10V69xHP4n11KeJ0 2BDbqtX5Ku4BGHq7jgYrntt32APgEwiumM+WaTJr2/wzbvkjSaMg51WcgJ2nVkUjrnhm 3nHCkzIiolvGAJ3X/vfgwLjbmb9IMiPESb8EHQstpZIqmVNQbg9FN2KjwDP1Tcs3gnK0 Weyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oav1PeRGPMZWIm7UG7Np40qqDwAtjIlXIG+x9/XHnYo=; b=ock2PVUQkmd1ShSfajGDf5iAptqMZvSfvzm5AFXpuaEJO7gBC9brpmcYjqbcnENE7U UySfyXnoUBarIw9jvA5Fyogu41Z3foPRE4+MmySJ71cYevIdHxSxWveaBgMv+cXc9SP1 oPkRzwusVp/Ri1nIi0KDfZoEwpcntxC2StFb/T82tivWoeyCpQR02xpcoVMeuEjKaI9f rmTby7aihJ/R4CdfktEIzolIkJ5HV7kQJNiigJH5mEgzdEXgO359yUW0MBlZPvH86wbj kwUzpUrf39GEk8XDeJ/6GNEWhw0i91BE6SDPhQpVLXZQdJLIrZHIqQvRiZSEzlnIArDV PrKw== X-Gm-Message-State: AOAM530wofP3ELlZKkzlU4FUPhz+LvIanCDm4tjn3KYbvpCqQf1HXKGa XGdiqFUvwV6HBjnmzqlXISaTDWIism8= X-Google-Smtp-Source: ABdhPJxYzW2t6UwQSXzm7StmkuerthmRFCrntGej6rOj/ZUAyNTY6Nkno2sHVV5vLDmIClHW3i+YRA== X-Received: by 2002:aa7:cb03:: with SMTP id s3mr24833467edt.189.1625594083633; Tue, 06 Jul 2021 10:54:43 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:43 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 07/13] checkpolicy: remove dead assignments Date: Tue, 6 Jul 2021 19:54:27 +0200 Message-Id: <20210706175433.29270-7-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The variable `cladatum` is otherwise always assigned before used, so these two assignments without a follow up usages are not needed. Found by clang-analyzer. Signed-off-by: Christian Göttsche --- checkpolicy/checkpolicy.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c index 9627275f..c88ca542 100644 --- a/checkpolicy/checkpolicy.c +++ b/checkpolicy/checkpolicy.c @@ -1176,8 +1176,6 @@ int main(int argc, char **argv) printf("\nNo such class.\n"); break; } - cladatum = - policydb.class_val_to_struct[tclass - 1]; } else { ans[strlen(ans) - 1] = 0; cladatum = @@ -1229,8 +1227,6 @@ int main(int argc, char **argv) printf("\nNo such class.\n"); break; } - cladatum = - policydb.class_val_to_struct[tclass - 1]; } else { ans[strlen(ans) - 1] = 0; cladatum = From patchwork Tue Jul 6 17:54:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7AE94C07E96 for ; Tue, 6 Jul 2021 17:54:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63AA861C3C for ; Tue, 6 Jul 2021 17:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230362AbhGFR5Y (ORCPT ); Tue, 6 Jul 2021 13:57:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbhGFR5Y (ORCPT ); Tue, 6 Jul 2021 13:57:24 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FD15C06175F for ; Tue, 6 Jul 2021 10:54:45 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id ch27so2767847edb.10 for ; Tue, 06 Jul 2021 10:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=F1B0uHrskLQnDB/5joLw9v6pW5a1r8MdgcnxKiuvrhk=; b=WJ8vIHnMyYlkQStGPL9ODxKuo9eoTwpqJ0j5UmfUaJ/tYY+ktKSeem7kfFSdV1a+el fnitSYOQo+eYr1cj9Bf4Nb25y+dibHstX/db5CNzKwDTyN5j+QBRXGpJm5iDIbi+vm7T H+Eghn5xJLf8EOPgqRoeYph+N1ynEdODXi4nTUJg/xpsRBvZZKO2F/cCtII+qq9VGOEp bXr443DTXdtBf+xx7CmDiJoYRf6gqynR2Ey1QH3cqFOnZhMFcYRMBtlocVE5F2q+wGTH ZiPwP0lxcRsYLamq7Ua+lGhAg1jN0irkX0HI37gSUwVw7iFlD6sx0BJbulo71O7jhgyV q5Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F1B0uHrskLQnDB/5joLw9v6pW5a1r8MdgcnxKiuvrhk=; b=sc9xkw6i74wsPJyFjByrrlazjvXNPYNQL5hzmISA+McD1SaCaci1bC1AQNITEH86WW 776MclETpqAkpL8C7bpjYPKaba0xXf+LQiWNsTFdANbIKifiNqgVHJL/Z3y6ZpIMiC7i iX4xP+sIu52b8Jr7herh5/WTLxvUckpTwJ+r7P3hmXKP4AZgA9OVy/X4f9b0KHOC/YKq BnAe5OYlW3eWhXDpiFBbisSuZ+IJcvBb0wnv5qUAUxSA8zMjbnL+n55B5gbFZuXACBlQ c5nGFH5Iv4bFlXyo5cfICAPF9v49mH1b4Q+/6ZtP3junbiKwCI9Ck65Sl12QrlXdrUKA /r/g== X-Gm-Message-State: AOAM5304JThla125s0Ps6W044919UZ35c1tOhvKa+2syRtkUqpXcSRXN Ild4foJxhN6lzSrWuOX+qKBgVVOFlrI= X-Google-Smtp-Source: ABdhPJwT+NG3izQpJ/DOMvWsYxF/2GRUOgWleFS4MuR25gYiHqmKTmOlbjapW7+CJ0ff04wxRWp5Tw== X-Received: by 2002:a05:6402:520c:: with SMTP id s12mr25407711edd.357.1625594084212; Tue, 06 Jul 2021 10:54:44 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:43 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 08/13] checkpolicy: check before potential NULL dereference Date: Tue, 6 Jul 2021 19:54:28 +0200 Message-Id: <20210706175433.29270-8-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org policy_define.c: In function ‘define_te_avtab_extended_perms’: policy_define.c:1946:17: error: potential null pointer dereference [-Werror=null-dereference] 1946 | r->omit = omit; | ^ In the case of `r` being NULL, avrule_read_ioctls() would return with its parameter `rangehead` being a pointer to NULL, which is considered a failure in its caller `avrule_ioctl_ranges`. So it is not necessary to alter the return value. Found by GCC 11 with LTO enabled. Signed-off-by: Christian Göttsche --- checkpolicy/policy_define.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c index 22218c07..370ff8e3 100644 --- a/checkpolicy/policy_define.c +++ b/checkpolicy/policy_define.c @@ -1943,7 +1943,9 @@ int avrule_read_ioctls(struct av_ioctl_range_list **rangehead) } } r = *rangehead; - r->omit = omit; + if (r) { + r->omit = omit; + } return 0; error: yyerror("out of memory"); From patchwork Tue Jul 6 17:54:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361029 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB30FC07E9B for ; Tue, 6 Jul 2021 17:54:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD53961C3C for ; Tue, 6 Jul 2021 17:54:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230364AbhGFR50 (ORCPT ); Tue, 6 Jul 2021 13:57:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbhGFR5Z (ORCPT ); Tue, 6 Jul 2021 13:57:25 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C35EC061574 for ; Tue, 6 Jul 2021 10:54:46 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id t3so29133563edt.12 for ; Tue, 06 Jul 2021 10:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kw9tONUBoPcTpbjcLQASEBtB8/lqOXIVnp171hSswSQ=; b=evloRo/PPkU0O/Aj/YCcK/qCQs4I6Gn8w44q40tFd5gW0e+rNHhdcCX5/eAM1aohLZ GKCi3YeF5nR254okP0hIxw7HHldakyW+Doe526tAr9YKfY7MI4H5pQ3+X6/0Wass2Opy sxAqOF0QkyDNJh2EA29oLqjTShgtGshrBkXO01L5rqI5IJiDYN073k9pDH8iwwemf7uQ Pj2twQgTl3h41fs1bsqREDFpxZ2ZKG/7YjOsQMFGOP4AZjvPkppYL8DnxCg5FxYFeEEO aPDdtTK/boMdfg9rzW0DJAv0YtteVektuTSUqPeQNwCrgIAf1nUhiYSb9EbnEgH038Bf 4oPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kw9tONUBoPcTpbjcLQASEBtB8/lqOXIVnp171hSswSQ=; b=sXl8/Mro6ut1pbIoeOc30FIaldbWCPAwX6WnsdTmuE3y4bN0TXUKDRbN8xRrcv3H60 tIL7k2pC0MiCWjk8chl+EJeTfi439btsRP0+o1Wv62DzVU6N/SaALhELp+K/WG3pijWP 426yAeFFMZ7XqNPE4RYBsubUbBBH9ePYSH4lml928pyP3gG+oLSIbcXUIBETw15XkQGS 3Haee2i9TnVrF9BzK9Z+f3B71EcAlYb+lVaVqcGb9mMliwFMoJTeQih7C3vdCqcOiW6n kd9Tg9Wke7cNb//otD/rWtC9fypn3gWTfLlaTzZCqZr35FZeSPyNDsKfsBtmEAbm6pxw Au3A== X-Gm-Message-State: AOAM531cBGu2hSEM5Rdx1daAKscMK7113Z5IIyNuhTG9Q6qhMr1A2Xbg zQSyLG97gMskGgeYjUJ5AVdGHs+jBvI= X-Google-Smtp-Source: ABdhPJyoBUDFxqYc87/i3zO3EIbaSxrGBKfRZuPhJJAdIvkI8pDKKl5crxPvphxJjOZ1xiZAdR01VA== X-Received: by 2002:a05:6402:28b3:: with SMTP id eg51mr321444edb.216.1625594084755; Tue, 06 Jul 2021 10:54:44 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:44 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 09/13] checkpolicy: avoid potential use of uninitialized variable Date: Tue, 6 Jul 2021 19:54:29 +0200 Message-Id: <20210706175433.29270-9-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org checkpolicy.c: In function ‘main’: checkpolicy.c:1000:25: error: ‘tsid’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 1000 | printf("if_sid %d default_msg_sid %d\n", ssid, tsid); | ^ checkpolicy.c: In function ‘main’: checkpolicy.c:971:25: error: ‘tsid’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 971 | printf("fs_sid %d default_file_sid %d\n", ssid, tsid); | ^ Found by GCC 11 with LTO enabled. Signed-off-by: Christian Göttsche --- checkpolicy/checkpolicy.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c index c88ca542..04f35eda 100644 --- a/checkpolicy/checkpolicy.c +++ b/checkpolicy/checkpolicy.c @@ -967,8 +967,12 @@ int main(int argc, char **argv) printf("fs kdevname? "); FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - sepol_fs_sid(ans, &ssid, &tsid); - printf("fs_sid %d default_file_sid %d\n", ssid, tsid); + ret = sepol_fs_sid(ans, &ssid, &tsid); + if (ret) { + printf("unknown fs kdevname\n"); + } else { + printf("fs_sid %d default_file_sid %d\n", ssid, tsid); + } break; case '9': printf("protocol? "); @@ -996,8 +1000,12 @@ int main(int argc, char **argv) printf("netif name? "); FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - sepol_netif_sid(ans, &ssid, &tsid); - printf("if_sid %d default_msg_sid %d\n", ssid, tsid); + ret = sepol_netif_sid(ans, &ssid, &tsid); + if (ret) { + printf("unknown name\n"); + } else { + printf("if_sid %d default_msg_sid %d\n", ssid, tsid); + } break; case 'b':{ char *p; From patchwork Tue Jul 6 17:54:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42AC0C07E9E for ; Tue, 6 Jul 2021 17:54:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2652F61C44 for ; Tue, 6 Jul 2021 17:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230379AbhGFR50 (ORCPT ); Tue, 6 Jul 2021 13:57:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbhGFR50 (ORCPT ); Tue, 6 Jul 2021 13:57:26 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0AFCC06175F for ; Tue, 6 Jul 2021 10:54:46 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id he13so16875183ejc.11 for ; Tue, 06 Jul 2021 10:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5+1JDzrlvP2/smXY+aB9mE2VxwJat1s6od2tQR7lYn0=; b=kA6/IjkbgLTHMRiDWz9AJnz5ouJbacmMw1GdWJCVd1tnfcmM7tGGQHK3SYNsv/T4AX o4qmQy9bRVvzp2BAqznHEYFJv3vuD3/MBeEOZ+arpgw0oK3maZRt/gKOB6XvSNVLwkHh lrYoxbWchPw6c3CYrl5iPIUCAH5OXXOdL+pBVXZwUnogycMJjTW4C3fnW2qB5OggLRL/ kJCFxfmu53on/p4folRgDyBdlCz6kyLjxxyaBP1EsYmWA+dCZQUjKCr8yCK9qQxI4oku ah20uc+diOHuu196I25DvVU79FIuXV3ds53dc1B1fwMZhI+FPaY9vvan11cTPX3lgDnA n89w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5+1JDzrlvP2/smXY+aB9mE2VxwJat1s6od2tQR7lYn0=; b=WYXBJDKr1W+NB/f7XjpeN+ORREID+PM8hkU+lcTAYVWF1OeSNBZCTRpq/enoqnHuYp GrWJeBABLWP9X8RnMU6RYZX7SxhoZTVTe/xqA2swFM54rh4uIV4soSQxKdOZ07vbh8e+ 2tW+YrDUnXSmCHRBFEHyiJJklTaj2KO3GGpmz6orp2bfX325PWlw5AQ/1TnrMgpM6Zqg V4GjRgkJkYEtpAjmt4Kb7OqvGDQiwOeEzGpEdh0WtqbgtfZrSTSrZHkhGZN5qWzIoSG5 8y1sruXOaub1Nkfuy5PbGPU5+00P4GkKSqRm9vFz4F7Blgxf8OBTNntfuzTKjPy1y5o1 UIhg== X-Gm-Message-State: AOAM533aqWOFTndNu+K+NhlpJo3jyeqbmDlcIb90NvJxmMtcIuq96KSi UK+cK2iKNTpw1XSFgXpkB30AqvVUS80= X-Google-Smtp-Source: ABdhPJxi5Qw6IJGND4MyPCyOW30xrqmWFlwX/KjLjIc9P5gJGbMzTqUBDN1seu5p5MxlbbUzf6H9uw== X-Received: by 2002:a17:907:3e0b:: with SMTP id hp11mr20492230ejc.523.1625594085372; Tue, 06 Jul 2021 10:54:45 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:45 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 10/13] checkpolicy: drop redundant cast to the same type Date: Tue, 6 Jul 2021 19:54:30 +0200 Message-Id: <20210706175433.29270-10-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Found by clang-tidy. Signed-off-by: Christian Göttsche --- checkpolicy/policy_define.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c index 370ff8e3..462e3994 100644 --- a/checkpolicy/policy_define.c +++ b/checkpolicy/policy_define.c @@ -1796,7 +1796,7 @@ int define_bool_tunable(int is_tunable) return -1; } - datum->state = (int)(bool_value[0] == 'T') ? 1 : 0; + datum->state = (bool_value[0] == 'T') ? 1 : 0; free(bool_value); return 0; cleanup: From patchwork Tue Jul 6 17:54:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E103AC07E96 for ; Tue, 6 Jul 2021 17:54:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C704661C3C for ; Tue, 6 Jul 2021 17:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230389AbhGFR51 (ORCPT ); Tue, 6 Jul 2021 13:57:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbhGFR50 (ORCPT ); Tue, 6 Jul 2021 13:57:26 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BE90C061760 for ; Tue, 6 Jul 2021 10:54:47 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id m1so29170282edq.8 for ; Tue, 06 Jul 2021 10:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+HGkori73bQZSmpkTJo4RO4NyngSpe/QDhj/TY3MWgM=; b=hLfarYaRnPsp7UTIahQ1bzG6FhZs5JpIWKd5hksxOmHZVonUrVi4UoZSlECYUxrO80 YFlorRdlqpvRpvBbuYr8pmCSRg8sQcLcj7/XWT65LZ8h6jtPB83BzXDmuiH9BchCIvGQ gUxi4gPyzMIFY14vYk4iXTt9NLiLZv9njXxvCOxu7D3NywW/oXYtIsvjh4Fsq1lr73nH C6ReD7i32NZ/BS6CFJ1oa1fVVVeBbkv/vV6rsd38UtR0JoBTb2uyBRmTvTdQT2/cf9Km /AEPUcFqzRTfNzCCtZaodgdZLthlg48H9GYL4SEgzkOgO8+1HFKuCI+stft0mVoDXL3B p6qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+HGkori73bQZSmpkTJo4RO4NyngSpe/QDhj/TY3MWgM=; b=U+mKjnui7dP2A25tmD059XdYBaQms4vR6PNx9Wkr0zwtB4B5N+lJEypQtwVoGuRNsR 1WxXDMw8C7mXtVRmDWcEDnNBtz5vJn5vIBayjVLZOv3wzARH+HsWV6he38HoUAqrcV94 nFxn6ec7Wn5CpxYho7dydv10e6a7CjyT5dL2LSstUu9kKEPvE483SxRYKz3WNN10sCZR inpSJ82r5VWvOi3W4uqt3Hv/E4uYbxBXgzotBXNg86wlQk0SFXzQMFpJB4Ph9K0jULF9 UUItHdRgYnUBNlrqDx+tnecbuwR6wIf6exdcjfAMMWhwqRl07QHCb/k3dK/KRwwfuBtM dwhg== X-Gm-Message-State: AOAM533A07wxwoY88eT9Fwao0QzPHB9lY63c9LhIuca8RSbaZ1UqJX9Y VvFzqyvKp40Ct2bg28MKn4yaMYOLOno= X-Google-Smtp-Source: ABdhPJxn88Bcmm6yrpz4XnwaG1y72C4O55gPYCbDd8gl4/CW+RtTwGO8Sbxwu0zXtERtNS2JAdvOKA== X-Received: by 2002:a05:6402:1688:: with SMTP id a8mr22878080edv.4.1625594085955; Tue, 06 Jul 2021 10:54:45 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:45 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 11/13] checkpolicy: parse_util drop unused declaration Date: Tue, 6 Jul 2021 19:54:31 +0200 Message-Id: <20210706175433.29270-11-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Signed-off-by: Christian Göttsche --- checkpolicy/parse_util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/checkpolicy/parse_util.c b/checkpolicy/parse_util.c index f2809b48..1795e93c 100644 --- a/checkpolicy/parse_util.c +++ b/checkpolicy/parse_util.c @@ -28,7 +28,6 @@ extern int yyparse(void); extern void yyrestart(FILE *); extern queue_t id_queue; extern unsigned int policydb_errors; -extern unsigned long policydb_lineno; extern policydb_t *policydbp; extern int mlspol; extern void set_source_file(const char *name); From patchwork Tue Jul 6 17:54:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 229CFC07E9B for ; Tue, 6 Jul 2021 17:54:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BAE161C44 for ; Tue, 6 Jul 2021 17:54:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230409AbhGFR51 (ORCPT ); Tue, 6 Jul 2021 13:57:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbhGFR51 (ORCPT ); Tue, 6 Jul 2021 13:57:27 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F04A3C061574 for ; Tue, 6 Jul 2021 10:54:47 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id he13so16875260ejc.11 for ; Tue, 06 Jul 2021 10:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=owOEfCGffVGQrfJc8S5GiUOD30lI+xpvB8JQIklYJEs=; b=Dxon+2JImlpNNeUvX611PHcibyYd//E1+qmV4P9hQ4LNAl1LaY5OTUCTK8O2CoxE5e oM8CxnIxAo4K9gxkuX7QWpvgAS3OFK6DNnpeHqeg3s2STFdgr5q29LvAgpEWge8Dmv7B B1DkrYoQMWLV3peLmMoIU70rMZL6K8i38uUs48QH26qeorC5b5oTyMSJ3mwqfQOKFVd6 mGoDkRTaB+iDm33IWtgPSr3/r+IYl3LAhqQ4pCIOmJc7e1+iMGZMUkt5WYEv/uz1p8UT mGfp+I1tgqM+haYv5/B8gE637AymnfBN8TPDMZiM06qbWbkw6L3/ks+j/SnH85PBZZ8n XKxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=owOEfCGffVGQrfJc8S5GiUOD30lI+xpvB8JQIklYJEs=; b=eepHW52OCVy8DQrFafSgk/NoD0TEcgVQDQyT9Z4utDomwguILA6Elwprwj70tgFcDu t5dWRRlGybvgXALvkIsyzvOHGmasmIMdhXIl2aNOn9dnz0oUKH3CoBxJ/ABI/Rst6boQ nW4ZN2Bx1I79Riz9Hwdq/ul1MWserZWmJ5wg49ngUA5W7xeMskOu4qx0JQKxZfiBfMuP RUyIL2el3bPTM5TRs2iE4eiADULXKSH1kLUQvtLR4ex5Iy5ybkdbwZapqJO22iItAx1m ZzagxvOT1ag9u14wsaifd7G3Zmi+s5w2DjGGbFjI74AK1vrqwIIpogDNN8NiMLCNIZA2 paVw== X-Gm-Message-State: AOAM532FqnzTAIdftytU9vE/at/ru4mKyfMhANYPRcYi9uxPqFipUEZU CAT9/+YoE8+6RlzAxI6QQqFmQfT/+q4= X-Google-Smtp-Source: ABdhPJwU99T1LvOTvCWXiDs5wNtZ/2YQspKor95fnmz+XU/vbe3ANSTpq/M+Q7oMIlLUle9OBNoPaA== X-Received: by 2002:a17:907:7797:: with SMTP id ky23mr20070780ejc.229.1625594086509; Tue, 06 Jul 2021 10:54:46 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:46 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 12/13] checkpolicy/test: mark file local functions static Date: Tue, 6 Jul 2021 19:54:32 +0200 Message-Id: <20210706175433.29270-12-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Signed-off-by: Christian Göttsche --- checkpolicy/test/dismod.c | 36 ++++++++++++++++++------------------ checkpolicy/test/dispol.c | 22 +++++++++++----------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c index b1b96115..90c29318 100644 --- a/checkpolicy/test/dismod.c +++ b/checkpolicy/test/dismod.c @@ -111,7 +111,7 @@ static void display_id(policydb_t * p, FILE * fp, uint32_t symbol_type, } } -int display_type_set(type_set_t * set, uint32_t flags, policydb_t * policy, +static int display_type_set(type_set_t * set, uint32_t flags, policydb_t * policy, FILE * fp) { unsigned int i, num_types; @@ -175,7 +175,7 @@ int display_type_set(type_set_t * set, uint32_t flags, policydb_t * policy, return 0; } -int display_mod_role_set(role_set_t * roles, policydb_t * p, FILE * fp) +static int display_mod_role_set(role_set_t * roles, policydb_t * p, FILE * fp) { unsigned int i, num = 0; @@ -210,7 +210,7 @@ int display_mod_role_set(role_set_t * roles, policydb_t * p, FILE * fp) } -int display_avrule(avrule_t * avrule, policydb_t * policy, +static int display_avrule(avrule_t * avrule, policydb_t * policy, FILE * fp) { class_perm_node_t *cur; @@ -313,7 +313,7 @@ int display_avrule(avrule_t * avrule, policydb_t * policy, return 0; } -int display_type_callback(hashtab_key_t key, hashtab_datum_t datum, void *data) +static int display_type_callback(hashtab_key_t key, hashtab_datum_t datum, void *data) { type_datum_t *type; FILE *fp; @@ -355,14 +355,14 @@ int display_type_callback(hashtab_key_t key, hashtab_datum_t datum, void *data) return 0; } -int display_types(policydb_t * p, FILE * fp) +static int display_types(policydb_t * p, FILE * fp) { if (hashtab_map(p->p_types.table, display_type_callback, fp)) return -1; return 0; } -int display_users(policydb_t * p, FILE * fp) +static int display_users(policydb_t * p, FILE * fp) { unsigned int i, j; ebitmap_t *bitmap; @@ -381,7 +381,7 @@ int display_users(policydb_t * p, FILE * fp) return 0; } -int display_bools(policydb_t * p, FILE * fp) +static int display_bools(policydb_t * p, FILE * fp) { unsigned int i; @@ -392,7 +392,7 @@ int display_bools(policydb_t * p, FILE * fp) return 0; } -void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) +static void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) { cond_expr_t *cur; @@ -427,14 +427,14 @@ void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) } } -void display_policycon(FILE * fp) +static void display_policycon(FILE * fp) { /* There was an attempt to implement this at one time. Look through * git history to find it. */ fprintf(fp, "Sorry, not implemented\n"); } -void display_initial_sids(policydb_t * p, FILE * fp) +static void display_initial_sids(policydb_t * p, FILE * fp) { ocontext_t *cur; char *user, *role, *type; @@ -459,7 +459,7 @@ void display_initial_sids(policydb_t * p, FILE * fp) #endif } -void display_class_set(ebitmap_t *classes, policydb_t *p, FILE *fp) +static void display_class_set(ebitmap_t *classes, policydb_t *p, FILE *fp) { unsigned int i, num = 0; @@ -482,7 +482,7 @@ void display_class_set(ebitmap_t *classes, policydb_t *p, FILE *fp) fprintf(fp, " }"); } -void display_role_trans(role_trans_rule_t * tr, policydb_t * p, FILE * fp) +static void display_role_trans(role_trans_rule_t * tr, policydb_t * p, FILE * fp) { for (; tr; tr = tr->next) { fprintf(fp, "role transition "); @@ -495,7 +495,7 @@ void display_role_trans(role_trans_rule_t * tr, policydb_t * p, FILE * fp) } } -void display_role_allow(role_allow_rule_t * ra, policydb_t * p, FILE * fp) +static void display_role_allow(role_allow_rule_t * ra, policydb_t * p, FILE * fp) { for (; ra; ra = ra->next) { fprintf(fp, "role allow "); @@ -517,7 +517,7 @@ static void display_filename_trans(filename_trans_rule_t * tr, policydb_t * p, F } } -int role_display_callback(hashtab_key_t key __attribute__((unused)), +static int role_display_callback(hashtab_key_t key __attribute__((unused)), hashtab_datum_t datum, void *data) { role_datum_t *role; @@ -611,7 +611,7 @@ int change_bool(char *name, int state, policydb_t * p, FILE * fp) } #endif -int display_avdecl(avrule_decl_t * decl, int field, +static int display_avdecl(avrule_decl_t * decl, int field, policydb_t * policy, FILE * out_fp) { fprintf(out_fp, "decl %u:%s\n", decl->decl_id, @@ -692,7 +692,7 @@ int display_avdecl(avrule_decl_t * decl, int field, return 0; /* should never get here */ } -int display_avblock(int field, policydb_t * policy, +static int display_avblock(int field, policydb_t * policy, FILE * out_fp) { avrule_block_t *block = policydb.global; @@ -710,7 +710,7 @@ int display_avblock(int field, policydb_t * policy, return 0; } -int display_handle_unknown(policydb_t * p, FILE * out_fp) +static int display_handle_unknown(policydb_t * p, FILE * out_fp) { if (p->handle_unknown == ALLOW_UNKNOWN) fprintf(out_fp, "Allow unknown classes and perms\n"); @@ -834,7 +834,7 @@ static void display_policycaps(policydb_t * p, FILE * fp) } } -int menu(void) +static int menu(void) { printf("\nSelect a command:\n"); printf("1) display unconditional AVTAB\n"); diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c index 37f71842..8ddefb04 100644 --- a/checkpolicy/test/dispol.c +++ b/checkpolicy/test/dispol.c @@ -42,7 +42,7 @@ static __attribute__((__noreturn__)) void usage(const char *progname) exit(1); } -int render_access_mask(uint32_t mask, avtab_key_t * key, policydb_t * p, +static int render_access_mask(uint32_t mask, avtab_key_t * key, policydb_t * p, FILE * fp) { char *perm; @@ -54,13 +54,13 @@ int render_access_mask(uint32_t mask, avtab_key_t * key, policydb_t * p, return 0; } -int render_type(uint32_t type, policydb_t * p, FILE * fp) +static int render_type(uint32_t type, policydb_t * p, FILE * fp) { fprintf(fp, "%s", p->p_type_val_to_name[type - 1]); return 0; } -int render_key(avtab_key_t * key, policydb_t * p, FILE * fp) +static int render_key(avtab_key_t * key, policydb_t * p, FILE * fp) { char *stype, *ttype, *tclass; stype = p->p_type_val_to_name[key->source_type - 1]; @@ -84,7 +84,7 @@ int render_key(avtab_key_t * key, policydb_t * p, FILE * fp) #define RENDER_DISABLED 0x0004 #define RENDER_CONDITIONAL (RENDER_ENABLED|RENDER_DISABLED) -int render_av_rule(avtab_key_t * key, avtab_datum_t * datum, uint32_t what, +static int render_av_rule(avtab_key_t * key, avtab_datum_t * datum, uint32_t what, policydb_t * p, FILE * fp) { if (!(what & RENDER_UNCONDITIONAL)) { @@ -163,7 +163,7 @@ int render_av_rule(avtab_key_t * key, avtab_datum_t * datum, uint32_t what, return 0; } -int display_avtab(avtab_t * a, uint32_t what, policydb_t * p, FILE * fp) +static int display_avtab(avtab_t * a, uint32_t what, policydb_t * p, FILE * fp) { unsigned int i; avtab_ptr_t cur; @@ -178,7 +178,7 @@ int display_avtab(avtab_t * a, uint32_t what, policydb_t * p, FILE * fp) return 0; } -int display_bools(policydb_t * p, FILE * fp) +static int display_bools(policydb_t * p, FILE * fp) { unsigned int i; @@ -189,7 +189,7 @@ int display_bools(policydb_t * p, FILE * fp) return 0; } -void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) +static void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) { cond_expr_t *cur; @@ -224,7 +224,7 @@ void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) } } -int display_cond_expressions(policydb_t * p, FILE * fp) +static int display_cond_expressions(policydb_t * p, FILE * fp) { cond_node_t *cur; cond_av_list_t *av_cur; @@ -249,7 +249,7 @@ int display_cond_expressions(policydb_t * p, FILE * fp) return 0; } -int display_handle_unknown(policydb_t * p, FILE * out_fp) +static int display_handle_unknown(policydb_t * p, FILE * out_fp) { if (p->handle_unknown == ALLOW_UNKNOWN) fprintf(out_fp, "Allow unknown classes and permissions\n"); @@ -260,7 +260,7 @@ int display_handle_unknown(policydb_t * p, FILE * out_fp) return 0; } -int change_bool(char *name, int state, policydb_t * p, FILE * fp) +static int change_bool(char *name, int state, policydb_t * p, FILE * fp) { cond_bool_datum_t *bool; @@ -368,7 +368,7 @@ static void display_filename_trans(policydb_t *p, FILE *fp) hashtab_map(p->filename_trans, filenametr_display, &args); } -int menu(void) +static int menu(void) { printf("\nSelect a command:\n"); printf("1) display unconditional AVTAB\n"); From patchwork Tue Jul 6 17:54:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12361035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7457BC07E9C for ; Tue, 6 Jul 2021 17:54:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60A8561C3C for ; Tue, 6 Jul 2021 17:54:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230347AbhGFR52 (ORCPT ); Tue, 6 Jul 2021 13:57:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230442AbhGFR52 (ORCPT ); Tue, 6 Jul 2021 13:57:28 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70C60C06175F for ; Tue, 6 Jul 2021 10:54:48 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id l24so29177781edr.11 for ; Tue, 06 Jul 2021 10:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qklAFuHgG6PaBIN7LRiq0ZqDomO1gxp4FJcY+IieCno=; b=pGzBkixzLr8F4NsB7DZWdbIK2FODkgy8Xcmv+9ICE1vnpWpxgrg87dGtSO/khtHf5E RdvJMORw9aJGAKnNRyKJS1qdGzHqzt4k/TweeSbGJQ/FyrI3/02ZuOHiaQZ78I8vSNT+ Re28z3/CwQGZGh42u865DuOMimugTdN3LNHW6628BzGvmJWtVnk31CLdCI2YQ6ti0/gv SJHqFbCU+Qufre9H9zmYiVpjOQoL5P1uUgXlA8l9hv5mlEtcY+2uOEpeQWST9gpT9iGH hrYCUWBWd0PbZDEsV4XUadxdnuSDgcd7XPKBjMFgFIW3qUHfDR7lvTxjSOxp8HHxbkVm mJcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qklAFuHgG6PaBIN7LRiq0ZqDomO1gxp4FJcY+IieCno=; b=G7oYAmhilbJV8DZ4bF2HbXDW1bTn6oSCSTk83zvvqCnbWL9ckMeJUoYhuzMASs9AFm 5PmyG5+ZlczTIAoIFx3gfubrWCiQFKH5r1ZsnTTP7j04Pl3VipUD2NEBPTFRElPF1HKo uikisdul54KrRIwT7xZ7PkngFh1yJyFd33YpiLRViGOQiYTlZPcnNUTj/UDBpY2R2Qoh /WeI1qXN/BeKvc2o3apZTu18AwS5hbp5QsSoSMsuUYRNbyvuB4aRFLOXKj0DBRAKMOR2 C/Td98WZRya4k2uTDMcyu/K3Xxw5KFMwRpv6Yi2cyEGU4ArZVjXpaIJ+huTMTLPcktPB z1EQ== X-Gm-Message-State: AOAM531QK/wxcN8rpDQH7GSrzC2nbkfBCPhIyQR9mJDXvFQksptEUszx ocZs/OcWLzMEVJX7bJCnDXAElCP//3c= X-Google-Smtp-Source: ABdhPJxbCxj4Hwdm7zZXzbIBb025aJP6+JKdiStMZot7R5/R6xZpihCf7PGckeFYmL4qfHHO/uXzww== X-Received: by 2002:a05:6402:31b3:: with SMTP id dj19mr25426513edb.24.1625594087043; Tue, 06 Jul 2021 10:54:47 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-116-100-174.95.116.pool.telefonica.de. [95.116.100.174]) by smtp.gmail.com with ESMTPSA id lg16sm6050950ejb.69.2021.07.06.10.54.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 10:54:46 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 13/13] checkpolicy: mark read-only parameters in policy define const Date: Tue, 6 Jul 2021 19:54:33 +0200 Message-Id: <20210706175433.29270-13-cgzones@googlemail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210706175433.29270-1-cgzones@googlemail.com> References: <20210706175433.29270-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Make it more obvious which parameters are read-only and not being modified and allow callers to pass const pointers. Signed-off-by: Christian Göttsche --- checkpolicy/policy_define.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c index 462e3994..a8aa615e 100644 --- a/checkpolicy/policy_define.c +++ b/checkpolicy/policy_define.c @@ -77,7 +77,7 @@ extern int yyerror(const char *msg); #define ERRORMSG_LEN 255 static char errormsg[ERRORMSG_LEN + 1] = {0}; -static int id_has_dot(char *id); +static int id_has_dot(const char *id); static int parse_security_context(context_struct_t *c); /* initialize all of the state variables for the scanner/parser */ @@ -141,7 +141,7 @@ int insert_id(const char *id, int push) /* If the identifier has a dot within it and that its first character is not a dot then return 1, else return 0. */ -static int id_has_dot(char *id) +static int id_has_dot(const char *id) { if (strchr(id, '.') >= id + 1) { return 1; @@ -2172,7 +2172,7 @@ void avrule_xperm_setrangebits(uint16_t low, uint16_t high, } } -int avrule_xperms_used(av_extended_perms_t *xperms) +int avrule_xperms_used(const av_extended_perms_t *xperms) { unsigned int i; @@ -2347,7 +2347,7 @@ unsigned int xperms_for_each_bit(unsigned int *bit, av_extended_perms_t *xperms) return 0; } -int avrule_cpy(avrule_t *dest, avrule_t *src) +int avrule_cpy(avrule_t *dest, const avrule_t *src) { class_perm_node_t *src_perms; class_perm_node_t *dest_perms, *dest_tail; @@ -2395,7 +2395,7 @@ int avrule_cpy(avrule_t *dest, avrule_t *src) return 0; } -int define_te_avtab_ioctl(avrule_t *avrule_template) +int define_te_avtab_ioctl(const avrule_t *avrule_template) { avrule_t *avrule; struct av_ioctl_range_list *rangelist; @@ -3444,9 +3444,10 @@ bad: return -1; } -static constraint_expr_t *constraint_expr_clone(constraint_expr_t * expr) +static constraint_expr_t *constraint_expr_clone(const constraint_expr_t * expr) { - constraint_expr_t *h = NULL, *l = NULL, *e, *newe; + constraint_expr_t *h = NULL, *l = NULL, *newe; + const constraint_expr_t *e; for (e = expr; e; e = e->next) { newe = malloc(sizeof(*newe)); if (!newe)