diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
| commit | 664cee46e755b37204f1731cb8726db610f3486d (patch) | |
| tree | 11ed0d43eff14123534785cf25c0a2143e134e7e /security/selinux | |
| parent | a0334c50bf0ba7c720ed00f931e721c989efd233 (diff) | |
| parent | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/ss/services.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 3e7544d2a07b..ea7c01f4a2bf 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
| @@ -213,7 +213,7 @@ static u16 map_class(u16 pol_value) | |||
| 213 | return i; | 213 | return i; |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | return pol_value; | 216 | return SECCLASS_NULL; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | static void map_decision(u16 tclass, struct av_decision *avd, | 219 | static void map_decision(u16 tclass, struct av_decision *avd, |