c59879b8aa
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libsepol-3.2..32611aea6543 -- libsepol
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From 1076a07288f527ac64dcd421ec01e424ee85474d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 8 Jun 2021 17:59:03 +0200
|
|
Subject: [PATCH] libsepol: remove dead stores
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Found by Infer
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
---
|
|
libsepol/src/services.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsepol/src/services.c b/libsepol/src/services.c
|
|
index c34bb9667fbc..f7c31d80f954 100644
|
|
--- a/libsepol/src/services.c
|
|
+++ b/libsepol/src/services.c
|
|
@@ -175,7 +175,7 @@ static int expr_buf_len;
|
|
static void cat_expr_buf(char *e_buf, const char *string)
|
|
{
|
|
int len, new_buf_len;
|
|
- char *p, *new_buf = e_buf;
|
|
+ char *p, *new_buf;
|
|
|
|
while (1) {
|
|
p = e_buf + expr_buf_used;
|
|
@@ -406,7 +406,7 @@ static int constraint_expr_eval_reason(context_struct_t *scontext,
|
|
#define TARGET 2
|
|
#define XTARGET 3
|
|
|
|
- int s_t_x_num = SOURCE;
|
|
+ int s_t_x_num;
|
|
|
|
/* Set 0 = fail, u = CEXPR_USER, r = CEXPR_ROLE, t = CEXPR_TYPE */
|
|
int u_r_t = 0;
|
|
--
|
|
2.32.0
|
|
|