Skip to contentSkip to conversation

Modify audit2why analyze function to use loaded policy

PATCH In review Joshua Brindle 1 participant 2 messages Jun 3, 2016 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Modify audit2why analyze function to use loaded policy

Class and perms should come from the policy being used for analysis, not the system policy so use sepol_ interfaces

Change-Id: Ia0590ed2514249fd98810a8d4fe87f8bf5280561

---
 libselinux/src/audit2why.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
libselinux/src/audit2why.c +4 -4
index 12745b3..abe1701 100644
@@ -343,8 +343,8 @@ static PyObject *analyze(PyObject *self __attribute__((unused)) , PyObject *args
 	if (rc < 0)
 		RETURN(BADTCON)
 
-	tclass = string_to_security_class(tclassstr);
-	if (!tclass)
+	rc = sepol_string_to_security_class(tclassstr, &tclass);
+	if (rc < 0)
 		RETURN(BADTCLASS)
 
 	/* Convert the permission list to an AV. */
@@ -365,8 +365,8 @@ static PyObject *analyze(PyObject *self __attribute__((unused)) , PyObject *args
 		permstr = PyString_AsString( strObj );
 #endif
 		
-		perm = string_to_av_perm(tclass, permstr);
-		if (!perm)
+		rc = sepol_string_to_av_perm(tclass, permstr, &perm);
+		if (rc < 0)
 			RETURN(BADPERM)
 
 		av |= perm;
Signature · 1 line
2.1.0
#1 lore raw
Quoted 3 lines · Joshua Brindle

Class and perms should come from the policy being used for analysis, not the system policy so use sepol_ interfaces

Hrm, this solved my original problem which was that I was getting the wrong answer back from audit2why (classes in my policy that weren't in the system policy can back with BADTCLASS instead of a more appropriate answer) but now I have a segfault so I'll try to track that down.

Quoted 31 lines

Change-Id: Ia0590ed2514249fd98810a8d4fe87f8bf5280561

---
  libselinux/src/audit2why.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
libselinux/src/audit2why.c +4 -4
index 12745b3..abe1701 100644
@@ -343,8 +343,8 @@ static PyObject *analyze(PyObject *self __attribute__((unused)) , PyObject *args
  	if (rc<  0)
  		RETURN(BADTCON)
 
-	tclass = string_to_security_class(tclassstr);
-	if (!tclass)
+	rc = sepol_string_to_security_class(tclassstr,&tclass);
+	if (rc<  0)
  		RETURN(BADTCLASS)
 
  	/* Convert the permission list to an AV. */
@@ -365,8 +365,8 @@ static PyObject *analyze(PyObject *self __attribute__((unused)) , PyObject *args
  		permstr = PyString_AsString( strObj );
  #endif
 
-		perm = string_to_av_perm(tclass, permstr);
-		if (!perm)
+		rc = sepol_string_to_av_perm(tclass, permstr,&perm);
+		if (rc<  0)
  			RETURN(BADPERM)
 
  		av |= perm;