diff options
author | Dustin Kirkland <dustin.kirkland@us.ibm.com> | 2005-11-16 10:53:13 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-20 14:08:54 -0500 |
commit | 7306a0b9b3e2056a616c84841288ca2431a05627 (patch) | |
tree | d3f61ef43c7079790d6b8ef9bf307689a7d9ea16 /security/selinux | |
parent | 8c8570fb8feef2bc166bee75a85748b25cda22d9 (diff) |
[PATCH] Miscellaneous bug and warning fixes
This patch fixes a couple of bugs revealed in new features recently
added to -mm1:
* fixes warnings due to inconsistent use of const struct inode *inode
* fixes bug that prevent a kernel from booting with audit on, and SELinux off
due to a missing function in security/dummy.c
* fixes a bug that throws spurious audit_panic() messages due to a missing
return just before an error_path label
* some reasonable house cleaning in audit_ipc_context(),
audit_inode_context(), and audit_log_task_context()
Signed-off-by: Dustin Kirkland <dustin.kirkland@us.ibm.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 9c08a19cc81b..81b726b1a419 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2247,7 +2247,7 @@ static const char *selinux_inode_xattr_getsuffix(void) | |||
2247 | * | 2247 | * |
2248 | * Permission check is handled by selinux_inode_getxattr hook. | 2248 | * Permission check is handled by selinux_inode_getxattr hook. |
2249 | */ | 2249 | */ |
2250 | static int selinux_inode_getsecurity(struct inode *inode, const char *name, void *buffer, size_t size, int err) | 2250 | static int selinux_inode_getsecurity(const struct inode *inode, const char *name, void *buffer, size_t size, int err) |
2251 | { | 2251 | { |
2252 | struct inode_security_struct *isec = inode->i_security; | 2252 | struct inode_security_struct *isec = inode->i_security; |
2253 | 2253 | ||