09820226ae
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline checkpolicy-3.2..32611aea6543 -- checkpolicy
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From db674bf2186b34a3712e2069c769131503dcb9ff Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 6 Jul 2021 19:54:24 +0200
|
|
Subject: [PATCH] checkpolicy: drop dead condition
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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 <cgzones@googlemail.com>
|
|
---
|
|
checkpolicy/policy_define.c | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c
|
|
index 16234f31bbc3..7eff747adacf 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;
|
|
--
|
|
2.32.0
|
|
|