041eacc63c
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libselinux-3.2..32611aea6543 -- libselinux
Related: rhbz#1938789
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From 04335ab146d18f5865bed3516d5cbc9057a3df89 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Mon, 3 May 2021 17:11:03 +0200
|
|
Subject: [PATCH] libselinux: label_media::init(): drop dead assignment
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The variable `lineno` is only used in the preceding loop and it always
|
|
set prior that to 0.
|
|
|
|
Found by clang-analyzer.
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
---
|
|
libselinux/src/label_media.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/libselinux/src/label_media.c b/libselinux/src/label_media.c
|
|
index d202e5d5ab83..eb27deaf510e 100644
|
|
--- a/libselinux/src/label_media.c
|
|
+++ b/libselinux/src/label_media.c
|
|
@@ -119,7 +119,6 @@ static int init(struct selabel_handle *rec, const struct selinux_opt *opts,
|
|
if (process_line(path, line_buf, pass, ++lineno, rec))
|
|
goto finish;
|
|
}
|
|
- lineno = 0;
|
|
|
|
if (pass == 0) {
|
|
if (data->nspec == 0) {
|
|
--
|
|
2.32.0
|
|
|