Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 · 7de8e5737d - Gogs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix regression for Xorg

Linus Torvalds 14 years ago

parent

b5b4bc32b6 85cd6da53a

commit

7de8e5737d

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
security/selinux/ss/services.c
							 
								View File
							
				@@ -213,7 +213,7 @@ static u16 map_class(u16 pol_value)
			
				 			return i;
			
				 	}
			
				-	return pol_value;
			
				+	return SECCLASS_NULL;
			
				 }
			
				 static void map_decision(u16 tclass, struct av_decision *avd,