Skip to contentSkip to conversation

libselinux: drop set but not used internal variable

PATCH In review Christian Göttsche 2 participants 3 messages Nov 9, 2022 – Nov 21, 2022 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselinux: drop set but not used internal variable

The internal variable avc_netlink_trouble is only assigned but never read from.
Unused since the initial commit 13cd4c896068 ("initial import from svn trunk revision 2950").

---
 libselinux/src/avc_internal.c | 2 --
 libselinux/src/avc_internal.h | 3 ---
 libselinux/src/sestatus.c     | 1 -
 3 files changed, 6 deletions(-)
libselinux/src/avc_internal.c +0 -2
index 71a1357b..ffc663e5 100644
@@ -51,7 +51,6 @@ char avc_prefix[AVC_PREFIX_SIZE] = "uavc";
 int avc_running = 0;
 int avc_enforcing = 1;
 int avc_setenforce = 0;
-int avc_netlink_trouble = 0;
 
 /* process setenforce events for netlink and sestatus */
 int avc_process_setenforce(int enforcing)
@@ -295,7 +294,6 @@ void avc_netlink_loop(void)
 
 	close(fd);
 	fd = -1;
-	avc_netlink_trouble = 1;
 	avc_log(SELINUX_ERROR,
 		"%s:  netlink thread: errors encountered, terminating\n",
 		avc_prefix);
libselinux/src/avc_internal.h +0 -3
index a9a4aa0b..54f0ce28 100644
@@ -180,7 +180,4 @@ int avc_ss_set_auditdeny(security_id_t ssid, security_id_t tsid,
 			 security_class_t tclass, access_vector_t perms,
 			 uint32_t seqno, uint32_t enable) ;
 
-/* netlink kernel message code */
-extern int avc_netlink_trouble ;
-
 #endif				/* _SELINUX_AVC_INTERNAL_H_ */
libselinux/src/sestatus.c +0 -1
index 89c1f621..fbe64301 100644
@@ -343,7 +343,6 @@ error:
 		if (avc_using_threads)
 		{
 			fallback_netlink_thread = avc_create_thread(&avc_netlink_loop);
-			avc_netlink_trouble = 0;
 		}
 
 		fallback_sequence = 0;
Signature · 1 line
2.38.1
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Christian Göttsche

The internal variable avc_netlink_trouble is only assigned but never read from.
Unused since the initial commit 13cd4c896068 ("initial import from svn trunk revision 2950").

Quoted 53 lines
---
 libselinux/src/avc_internal.c | 2 --
 libselinux/src/avc_internal.h | 3 ---
 libselinux/src/sestatus.c     | 1 -
 3 files changed, 6 deletions(-)
libselinux/src/avc_internal.c +0 -2
index 71a1357b..ffc663e5 100644
@@ -51,7 +51,6 @@ char avc_prefix[AVC_PREFIX_SIZE] = "uavc";
 int avc_running = 0;
 int avc_enforcing = 1;
 int avc_setenforce = 0;
-int avc_netlink_trouble = 0;
 
 /* process setenforce events for netlink and sestatus */
 int avc_process_setenforce(int enforcing)
@@ -295,7 +294,6 @@ void avc_netlink_loop(void)
 
        close(fd);
        fd = -1;
-       avc_netlink_trouble = 1;
        avc_log(SELINUX_ERROR,
                "%s:  netlink thread: errors encountered, terminating\n",
                avc_prefix);
libselinux/src/avc_internal.h +0 -3
index a9a4aa0b..54f0ce28 100644
@@ -180,7 +180,4 @@ int avc_ss_set_auditdeny(security_id_t ssid, security_id_t tsid,
                         security_class_t tclass, access_vector_t perms,
                         uint32_t seqno, uint32_t enable) ;
 
-/* netlink kernel message code */
-extern int avc_netlink_trouble ;
-
 #endif                         /* _SELINUX_AVC_INTERNAL_H_ */
libselinux/src/sestatus.c +0 -2
index 89c1f621..fbe64301 100644
@@ -343,7 +343,6 @@ error:
                if (avc_using_threads)
                {
                        fallback_netlink_thread = avc_create_thread(&avc_netlink_loop);
-                       avc_netlink_trouble = 0;
                }
 
                fallback_sequence = 0;
--

2.38.1

#2 lore raw
Quoted 4 lines · James Carter
Quoted 1 line · Christian Göttsche
Quoted 9 lines
Quoted 6 lines

The internal variable avc_netlink_trouble is only assigned but never read from.
Unused since the initial commit 13cd4c896068 ("initial import from svn trunk revision 2950").

Merged.
Thanks,
Jim

Quoted 53 lines
Quoted 53 lines
---
 libselinux/src/avc_internal.c | 2 --
 libselinux/src/avc_internal.h | 3 ---
 libselinux/src/sestatus.c     | 1 -
 3 files changed, 6 deletions(-)
libselinux/src/avc_internal.c +0 -2
index 71a1357b..ffc663e5 100644
@@ -51,7 +51,6 @@ char avc_prefix[AVC_PREFIX_SIZE] = "uavc";
 int avc_running = 0;
 int avc_enforcing = 1;
 int avc_setenforce = 0;
-int avc_netlink_trouble = 0;
 
 /* process setenforce events for netlink and sestatus */
 int avc_process_setenforce(int enforcing)
@@ -295,7 +294,6 @@ void avc_netlink_loop(void)
 
        close(fd);
        fd = -1;
-       avc_netlink_trouble = 1;
        avc_log(SELINUX_ERROR,
                "%s:  netlink thread: errors encountered, terminating\n",
                avc_prefix);
libselinux/src/avc_internal.h +0 -3
index a9a4aa0b..54f0ce28 100644
@@ -180,7 +180,4 @@ int avc_ss_set_auditdeny(security_id_t ssid, security_id_t tsid,
                         security_class_t tclass, access_vector_t perms,
                         uint32_t seqno, uint32_t enable) ;
 
-/* netlink kernel message code */
-extern int avc_netlink_trouble ;
-
 #endif                         /* _SELINUX_AVC_INTERNAL_H_ */
libselinux/src/sestatus.c +0 -2
index 89c1f621..fbe64301 100644
@@ -343,7 +343,6 @@ error:
                if (avc_using_threads)
                {
                        fallback_netlink_thread = avc_create_thread(&avc_netlink_loop);
-                       avc_netlink_trouble = 0;
                }
 
                fallback_sequence = 0;
--

2.38.1