Thanks Stephen. That works.

-----Original Message-----
From: Stephen Smalley [mailto:[email protected]] 
Sent: Thursday, July 14, 2016 9:18 PM
To: [email protected]
Cc: Inamdar Sharif; [email protected]; Stephen Smalley
Subject: [PATCH] Extend checkpolicy pathname matching.

checkpolicy currently imposes arbitrary limits on pathnames used in genfscon 
and other statements.  This prevents specifying certain paths in /proc such as 
those containing comma (,) characters.

Generalize the PATH, QPATH, and FILENAME patterns to support most legal 
pathnames.

For simplicity, we do not support pathnames containing newlines or quotes.

Reported-by: Inamdar Sharif <[email protected]>
Signed-off-by: Stephen Smalley <[email protected]>
---
 checkpolicy/policy_scan.l | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/checkpolicy/policy_scan.l b/checkpolicy/policy_scan.l index 
22da338..2f7f221 100644
--- a/checkpolicy/policy_scan.l
+++ b/checkpolicy/policy_scan.l
@@ -249,9 +249,9 @@ high |
 HIGH                           { return(HIGH); }
 low |
 LOW                            { return(LOW); }
-"/"({alnum}|[_\.\-/])*         { return(PATH); }
-\""/"[ !#-~]*\"                { return(QPATH); }
-\"({alnum}|[_\.\-\+\~\: ])+\"  { return(FILENAME); }
+"/"[^ \n\r\t\f]*               { return(PATH); }
+\""/"[^\"\n]*\"                { return(QPATH); }
+\"[^"/"\"\n]+\"        { return(FILENAME); }
 {letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))*        { return(IDENTIFIER); }
 {digit}+|0x{hexval}+            { return(NUMBER); }
 {alnum}*{letter}{alnum}*        { return(FILESYSTEM); }
--
2.5.5

-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may 
contain
confidential information.  Any unauthorized review, use, disclosure or 
distribution
is prohibited.  If you are not the intended recipient, please contact the 
sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------

_______________________________________________
Seandroid-list mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to 
[email protected].

Reply via email to