diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2008-04-04 14:46:05 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-04-08 00:30:14 +0200 |
commit | 869ab5147e1eead890245cfd4f652ba282b6ac26 (patch) | |
tree | 8334fe84734e14e247fb7b4ef78f9a43891249f0 /security/selinux/include/security.h | |
parent | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf... (diff) | |
download | linux-869ab5147e1eead890245cfd4f652ba282b6ac26.tar.xz linux-869ab5147e1eead890245cfd4f652ba282b6ac26.zip |
SELinux: more GFP_NOFS fixups to prevent selinux from re-entering the fs code
More cases where SELinux must not re-enter the fs code. Called from the
d_instantiate security hook.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/include/security.h')
-rw-r--r-- | security/selinux/include/security.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index f7d2f03781f2..44e12ec88090 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -86,7 +86,8 @@ int security_sid_to_context(u32 sid, char **scontext, int security_context_to_sid(char *scontext, u32 scontext_len, u32 *out_sid); -int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *out_sid, u32 def_sid); +int security_context_to_sid_default(char *scontext, u32 scontext_len, + u32 *out_sid, u32 def_sid, gfp_t gfp_flags); int security_get_user_sids(u32 callsid, char *username, u32 **sids, u32 *nel); |