Skip to content

Commit

Permalink
selinux: sparse fix: fix warnings in netlink code
Browse files Browse the repository at this point in the history
Fix sparse warnings in SELinux Netlink code.

Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
James Morris committed Sep 9, 2011
1 parent ad3fa08 commit 6a3fbe8
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
1 change: 0 additions & 1 deletion security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@

#define NUM_SEL_MNT_OPTS 5

extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
extern struct security_operations *security_ops;

/* SECMARK reference count */
Expand Down
3 changes: 3 additions & 0 deletions security/selinux/include/security.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@ extern int selinux_disable(void);
extern void exit_sel_fs(void);
extern struct dentry *selinux_null;
extern struct vfsmount *selinuxfs_mount;
extern void selnl_notify_setenforce(int val);
extern void selnl_notify_policyload(u32 seqno);
extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);

#endif /* _SELINUX_SECURITY_H_ */

2 changes: 2 additions & 0 deletions security/selinux/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include <linux/selinux_netlink.h>
#include <net/net_namespace.h>

#include "security.h"

static struct sock *selnl;

static int selnl_msglen(int msgtype)
Expand Down
1 change: 1 addition & 0 deletions security/selinux/nlmsgtab.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "flask.h"
#include "av_permissions.h"
#include "security.h"

struct nlmsg_perm {
u16 nlmsg_type;
Expand Down
2 changes: 0 additions & 2 deletions security/selinux/selinuxfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ static char policy_opened;
/* global data for policy capabilities */
static struct dentry *policycap_dir;

extern void selnl_notify_setenforce(int val);

/* Check whether a task is allowed to use a security operation. */
static int task_has_security(struct task_struct *tsk,
u32 perms)
Expand Down
2 changes: 0 additions & 2 deletions security/selinux/ss/services.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
#include "ebitmap.h"
#include "audit.h"

extern void selnl_notify_policyload(u32 seqno);

int selinux_policycap_netpeer;
int selinux_policycap_openperm;

Expand Down

0 comments on commit 6a3fbe8

Please sign in to comment.