Skip to content

L
linux
Commit cfd299df authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: Fix a RCU free problem with the netport cache
  SELinux: Made netnode cache adds faster
  SELinux: include/security.h whitespace, syntax, and other cleanups
  SELinux: policydb.h whitespace, syntax, and other cleanups
  SELinux: mls_types.h whitespace, syntax, and other cleanups
  SELinux: mls.h whitespace, syntax, and other cleanups
  SELinux: hashtab.h whitespace, syntax, and other cleanups
  SELinux: context.h whitespace, syntax, and other cleanups
  SELinux: ss/conditional.h whitespace, syntax, and other cleanups
  SELinux: selinux/include/security.h whitespace, syntax, and other cleanups
  SELinux: objsec.h whitespace, syntax, and other cleanups
  SELinux: netlabel.h whitespace, syntax, and other cleanups
  SELinux: avc_ss.h whitespace, syntax, and other cleanups

Fixed up conflict in include/linux/security.h manually
parents 6b8588f7 c9b7b979
Show whitespace changes
Inline Side-by-side
Showing with 570 additions and 583 deletions
include/linux/security.h
View file @ cfd299df
...@@ -44,27 +44,27 @@ struct audit_krule; ...@@ -44,27 +44,27 @@ struct audit_krule;
* These functions are in security/capability.c and are used * These functions are in security/capability.c and are used
* as the default capabilities functions * as the default capabilities functions
*/ */
extern int cap_capable (struct task_struct *tsk, int cap); extern int cap_capable(struct task_struct *tsk, int cap);
extern int cap_settime (struct timespec *ts, struct timezone *tz); extern int cap_settime(struct timespec *ts, struct timezone *tz);
extern int cap_ptrace (struct task_struct *parent, struct task_struct *child); extern int cap_ptrace(struct task_struct *parent, struct task_struct *child);
extern int cap_capget (struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
extern int cap_capset_check (struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); extern int cap_capset_check(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
extern void cap_capset_set (struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); extern void cap_capset_set(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
extern int cap_bprm_set_security (struct linux_binprm *bprm); extern int cap_bprm_set_security(struct linux_binprm *bprm);
extern void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe); extern void cap_bprm_apply_creds(struct linux_binprm *bprm, int unsafe);
extern int cap_bprm_secureexec(struct linux_binprm *bprm); extern int cap_bprm_secureexec(struct linux_binprm *bprm);
extern int cap_inode_setxattr(struct dentry *dentry, char *name, void *value, size_t size, int flags); extern int cap_inode_setxattr(struct dentry *dentry, char *name, void *value, size_t size, int flags);
extern int cap_inode_removexattr(struct dentry *dentry, char *name); extern int cap_inode_removexattr(struct dentry *dentry, char *name);
extern int cap_inode_need_killpriv(struct dentry *dentry); extern int cap_inode_need_killpriv(struct dentry *dentry);
extern int cap_inode_killpriv(struct dentry *dentry); extern int cap_inode_killpriv(struct dentry *dentry);
extern int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags); extern int cap_task_post_setuid(uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
extern void cap_task_reparent_to_init (struct task_struct *p); extern void cap_task_reparent_to_init(struct task_struct *p);
extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3, extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5, long *rc_p); unsigned long arg4, unsigned long arg5, long *rc_p);
extern int cap_task_setscheduler (struct task_struct *p, int policy, struct sched_param *lp); extern int cap_task_setscheduler(struct task_struct *p, int policy, struct sched_param *lp);
extern int cap_task_setioprio (struct task_struct *p, int ioprio); extern int cap_task_setioprio(struct task_struct *p, int ioprio);
extern int cap_task_setnice (struct task_struct *p, int nice); extern int cap_task_setnice(struct task_struct *p, int nice);
extern int cap_syslog (int type); extern int cap_syslog(int type);
extern int cap_vm_enough_memory(struct mm_struct *mm, long pages); extern int cap_vm_enough_memory(struct mm_struct *mm, long pages);
struct msghdr; struct msghdr;
...@@ -128,7 +128,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) ...@@ -128,7 +128,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
{ {
int i; int i;
if (opts->mnt_opts) if (opts->mnt_opts)
for(i = 0; i < opts->num_mnt_opts; i++) for (i = 0; i < opts->num_mnt_opts; i++)
kfree(opts->mnt_opts[i]); kfree(opts->mnt_opts[i]);
kfree(opts->mnt_opts); kfree(opts->mnt_opts);
opts->mnt_opts = NULL; opts->mnt_opts = NULL;
...@@ -1283,49 +1283,49 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) ...@@ -1283,49 +1283,49 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
struct security_operations { struct security_operations {
char name[SECURITY_NAME_MAX + 1]; char name[SECURITY_NAME_MAX + 1];
int (*ptrace) (struct task_struct * parent, struct task_struct * child); int (*ptrace) (struct task_struct *parent, struct task_struct *child);
int (*capget) (struct task_struct * target, int (*capget) (struct task_struct *target,
kernel_cap_t * effective, kernel_cap_t *effective,
kernel_cap_t * inheritable, kernel_cap_t * permitted); kernel_cap_t *inheritable, kernel_cap_t *permitted);
int (*capset_check) (struct task_struct * target, int (*capset_check) (struct task_struct *target,
kernel_cap_t * effective, kernel_cap_t *effective,
kernel_cap_t * inheritable, kernel_cap_t *inheritable,
kernel_cap_t * permitted); kernel_cap_t *permitted);
void (*capset_set) (struct task_struct * target, void (*capset_set) (struct task_struct *target,
kernel_cap_t * effective, kernel_cap_t *effective,
kernel_cap_t * inheritable, kernel_cap_t *inheritable,
kernel_cap_t * permitted); kernel_cap_t *permitted);
int (*capable) (struct task_struct * tsk, int cap); int (*capable) (struct task_struct *tsk, int cap);
int (*acct) (struct file * file); int (*acct) (struct file *file);
int (*sysctl) (struct ctl_table * table, int op); int (*sysctl) (struct ctl_table *table, int op);
int (*quotactl) (int cmds, int type, int id, struct super_block * sb); int (*quotactl) (int cmds, int type, int id, struct super_block *sb);
int (*quota_on) (struct dentry * dentry); int (*quota_on) (struct dentry *dentry);
int (*syslog) (int type); int (*syslog) (int type);
int (*settime) (struct timespec *ts, struct timezone *tz); int (*settime) (struct timespec *ts, struct timezone *tz);
int (*vm_enough_memory) (struct mm_struct *mm, long pages); int (*vm_enough_memory) (struct mm_struct *mm, long pages);
int (*bprm_alloc_security) (struct linux_binprm * bprm); int (*bprm_alloc_security) (struct linux_binprm *bprm);
void (*bprm_free_security) (struct linux_binprm * bprm); void (*bprm_free_security) (struct linux_binprm *bprm);
void (*bprm_apply_creds) (struct linux_binprm * bprm, int unsafe); void (*bprm_apply_creds) (struct linux_binprm *bprm, int unsafe);
void (*bprm_post_apply_creds) (struct linux_binprm * bprm); void (*bprm_post_apply_creds) (struct linux_binprm *bprm);
int (*bprm_set_security) (struct linux_binprm * bprm); int (*bprm_set_security) (struct linux_binprm *bprm);
int (*bprm_check_security) (struct linux_binprm * bprm); int (*bprm_check_security) (struct linux_binprm *bprm);
int (*bprm_secureexec) (struct linux_binprm * bprm); int (*bprm_secureexec) (struct linux_binprm *bprm);
int (*sb_alloc_security) (struct super_block * sb); int (*sb_alloc_security) (struct super_block *sb);
void (*sb_free_security) (struct super_block * sb); void (*sb_free_security) (struct super_block *sb);
int (*sb_copy_data)(char *orig, char *copy); int (*sb_copy_data) (char *orig, char *copy);
int (*sb_kern_mount) (struct super_block *sb, void *data); int (*sb_kern_mount) (struct super_block *sb, void *data);
int (*sb_statfs) (struct dentry *dentry); int (*sb_statfs) (struct dentry *dentry);
int (*sb_mount) (char *dev_name, struct path *path, int (*sb_mount) (char *dev_name, struct path *path,
char *type, unsigned long flags, void *data); char *type, unsigned long flags, void *data);
int (*sb_check_sb) (struct vfsmount * mnt, struct path *path); int (*sb_check_sb) (struct vfsmount *mnt, struct path *path);
int (*sb_umount) (struct vfsmount * mnt, int flags); int (*sb_umount) (struct vfsmount *mnt, int flags);
void (*sb_umount_close) (struct vfsmount * mnt); void (*sb_umount_close) (struct vfsmount *mnt);
void (*sb_umount_busy) (struct vfsmount * mnt); void (*sb_umount_busy) (struct vfsmount *mnt);
void (*sb_post_remount) (struct vfsmount * mnt, void (*sb_post_remount) (struct vfsmount *mnt,
unsigned long flags, void *data); unsigned long flags, void *data);
void (*sb_post_addmount) (struct vfsmount * mnt, void (*sb_post_addmount) (struct vfsmount *mnt,
struct path *mountpoint); struct path *mountpoint);
int (*sb_pivotroot) (struct path *old_path, int (*sb_pivotroot) (struct path *old_path,
struct path *new_path); struct path *new_path);
...@@ -1371,94 +1371,94 @@ struct security_operations { ...@@ -1371,94 +1371,94 @@ struct security_operations {
int (*inode_removexattr) (struct dentry *dentry, char *name); int (*inode_removexattr) (struct dentry *dentry, char *name);
int (*inode_need_killpriv) (struct dentry *dentry); int (*inode_need_killpriv) (struct dentry *dentry);
int (*inode_killpriv) (struct dentry *dentry); int (*inode_killpriv) (struct dentry *dentry);
int (*inode_getsecurity)(const struct inode *inode, const char *name, void **buffer, bool alloc); int (*inode_getsecurity) (const struct inode *inode, const char *name, void **buffer, bool alloc);
int (*inode_setsecurity)(struct inode *inode, const char *name, const void *value, size_t size, int flags); int (*inode_setsecurity) (struct inode *inode, const char *name, const void *value, size_t size, int flags);
int (*inode_listsecurity)(struct inode *inode, char *buffer, size_t buffer_size); int (*inode_listsecurity) (struct inode *inode, char *buffer, size_t buffer_size);
void (*inode_getsecid)(const struct inode *inode, u32 *secid); void (*inode_getsecid) (const struct inode *inode, u32 *secid);
int (*file_permission) (struct file * file, int mask); int (*file_permission) (struct file *file, int mask);
int (*file_alloc_security) (struct file * file); int (*file_alloc_security) (struct file *file);
void (*file_free_security) (struct file * file); void (*file_free_security) (struct file *file);
int (*file_ioctl) (struct file * file, unsigned int cmd, int (*file_ioctl) (struct file *file, unsigned int cmd,
unsigned long arg); unsigned long arg);
int (*file_mmap) (struct file * file, int (*file_mmap) (struct file *file,
unsigned long reqprot, unsigned long prot, unsigned long reqprot, unsigned long prot,
unsigned long flags, unsigned long addr, unsigned long flags, unsigned long addr,
unsigned long addr_only); unsigned long addr_only);
int (*file_mprotect) (struct vm_area_struct * vma, int (*file_mprotect) (struct vm_area_struct *vma,
unsigned long reqprot, unsigned long reqprot,
unsigned long prot); unsigned long prot);
int (*file_lock) (struct file * file, unsigned int cmd); int (*file_lock) (struct file *file, unsigned int cmd);
int (*file_fcntl) (struct file * file, unsigned int cmd, int (*file_fcntl) (struct file *file, unsigned int cmd,
unsigned long arg); unsigned long arg);
int (*file_set_fowner) (struct file * file); int (*file_set_fowner) (struct file *file);
int (*file_send_sigiotask) (struct task_struct * tsk, int (*file_send_sigiotask) (struct task_struct *tsk,
struct fown_struct * fown, int sig); struct fown_struct *fown, int sig);
int (*file_receive) (struct file * file); int (*file_receive) (struct file *file);
int (*dentry_open) (struct file *file); int (*dentry_open) (struct file *file);
int (*task_create) (unsigned long clone_flags); int (*task_create) (unsigned long clone_flags);
int (*task_alloc_security) (struct task_struct * p); int (*task_alloc_security) (struct task_struct *p);
void (*task_free_security) (struct task_struct * p); void (*task_free_security) (struct task_struct *p);
int (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags); int (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags);
int (*task_post_setuid) (uid_t old_ruid /* or fsuid */ , int (*task_post_setuid) (uid_t old_ruid /* or fsuid */ ,
uid_t old_euid, uid_t old_suid, int flags); uid_t old_euid, uid_t old_suid, int flags);
int (*task_setgid) (gid_t id0, gid_t id1, gid_t id2, int flags); int (*task_setgid) (gid_t id0, gid_t id1, gid_t id2, int flags);
int (*task_setpgid) (struct task_struct * p, pid_t pgid); int (*task_setpgid) (struct task_struct *p, pid_t pgid);
int (*task_getpgid) (struct task_struct * p); int (*task_getpgid) (struct task_struct *p);
int (*task_getsid) (struct task_struct * p); int (*task_getsid) (struct task_struct *p);
void (*task_getsecid) (struct task_struct * p, u32 * secid); void (*task_getsecid) (struct task_struct *p, u32 *secid);
int (*task_setgroups) (struct group_info *group_info); int (*task_setgroups) (struct group_info *group_info);
int (*task_setnice) (struct task_struct * p, int nice); int (*task_setnice) (struct task_struct *p, int nice);
int (*task_setioprio) (struct task_struct * p, int ioprio); int (*task_setioprio) (struct task_struct *p, int ioprio);
int (*task_getioprio) (struct task_struct * p); int (*task_getioprio) (struct task_struct *p);
int (*task_setrlimit) (unsigned int resource, struct rlimit * new_rlim); int (*task_setrlimit) (unsigned int resource, struct rlimit *new_rlim);
int (*task_setscheduler) (struct task_struct * p, int policy, int (*task_setscheduler) (struct task_struct *p, int policy,
struct sched_param * lp); struct sched_param *lp);
int (*task_getscheduler) (struct task_struct * p); int (*task_getscheduler) (struct task_struct *p);
int (*task_movememory) (struct task_struct * p); int (*task_movememory) (struct task_struct *p);
int (*task_kill) (struct task_struct * p, int (*task_kill) (struct task_struct *p,
struct siginfo * info, int sig, u32 secid); struct siginfo *info, int sig, u32 secid);
int (*task_wait) (struct task_struct * p); int (*task_wait) (struct task_struct *p);
int (*task_prctl) (int option, unsigned long arg2, int (*task_prctl) (int option, unsigned long arg2,
unsigned long arg3, unsigned long arg4, unsigned long arg3, unsigned long arg4,
unsigned long arg5, long *rc_p); unsigned long arg5, long *rc_p);
void (*task_reparent_to_init) (struct task_struct * p); void (*task_reparent_to_init) (struct task_struct *p);
void (*task_to_inode)(struct task_struct *p, struct inode *inode); void (*task_to_inode) (struct task_struct *p, struct inode *inode);
int (*ipc_permission) (struct kern_ipc_perm * ipcp, short flag); int (*ipc_permission) (struct kern_ipc_perm *ipcp, short flag);
void (*ipc_getsecid) (struct kern_ipc_perm *ipcp, u32 *secid); void (*ipc_getsecid) (struct kern_ipc_perm *ipcp, u32 *secid);
int (*msg_msg_alloc_security) (struct msg_msg * msg); int (*msg_msg_alloc_security) (struct msg_msg *msg);
void (*msg_msg_free_security) (struct msg_msg * msg); void (*msg_msg_free_security) (struct msg_msg *msg);
int (*msg_queue_alloc_security) (struct msg_queue * msq); int (*msg_queue_alloc_security) (struct msg_queue *msq);
void (*msg_queue_free_security) (struct msg_queue * msq); void (*msg_queue_free_security) (struct msg_queue *msq);
int (*msg_queue_associate) (struct msg_queue * msq, int msqflg); int (*msg_queue_associate) (struct msg_queue *msq, int msqflg);
int (*msg_queue_msgctl) (struct msg_queue * msq, int cmd); int (*msg_queue_msgctl) (struct msg_queue *msq, int cmd);
int (*msg_queue_msgsnd) (struct msg_queue * msq, int (*msg_queue_msgsnd) (struct msg_queue *msq,
struct msg_msg * msg, int msqflg); struct msg_msg *msg, int msqflg);
int (*msg_queue_msgrcv) (struct msg_queue * msq, int (*msg_queue_msgrcv) (struct msg_queue *msq,
struct msg_msg * msg, struct msg_msg *msg,
struct task_struct * target, struct task_struct *target,
long type, int mode); long type, int mode);
int (*shm_alloc_security) (struct shmid_kernel * shp); int (*shm_alloc_security) (struct shmid_kernel *shp);
void (*shm_free_security) (struct shmid_kernel * shp); void (*shm_free_security) (struct shmid_kernel *shp);
int (*shm_associate) (struct shmid_kernel * shp, int shmflg); int (*shm_associate) (struct shmid_kernel *shp, int shmflg);
int (*shm_shmctl) (struct shmid_kernel * shp, int cmd); int (*shm_shmctl) (struct shmid_kernel *shp, int cmd);
int (*shm_shmat) (struct shmid_kernel * shp, int (*shm_shmat) (struct shmid_kernel *shp,
char __user *shmaddr, int shmflg); char __user *shmaddr, int shmflg);
int (*sem_alloc_security) (struct sem_array * sma); int (*sem_alloc_security) (struct sem_array *sma);
void (*sem_free_security) (struct sem_array * sma); void (*sem_free_security) (struct sem_array *sma);
int (*sem_associate) (struct sem_array * sma, int semflg); int (*sem_associate) (struct sem_array *sma, int semflg);
int (*sem_semctl) (struct sem_array * sma, int cmd); int (*sem_semctl) (struct sem_array *sma, int cmd);
int (*sem_semop) (struct sem_array * sma, int (*sem_semop) (struct sem_array *sma,
struct sembuf * sops, unsigned nsops, int alter); struct sembuf *sops, unsigned nsops, int alter);
int (*netlink_send) (struct sock * sk, struct sk_buff * skb); int (*netlink_send) (struct sock *sk, struct sk_buff *skb);
int (*netlink_recv) (struct sk_buff * skb, int cap); int (*netlink_recv) (struct sk_buff *skb, int cap);
/* allow module stacking */ /* allow module stacking */
int (*register_security) (const char *name, int (*register_security) (const char *name,
...@@ -1466,50 +1466,50 @@ struct security_operations { ...@@ -1466,50 +1466,50 @@ struct security_operations {
void (*d_instantiate) (struct dentry *dentry, struct inode *inode); void (*d_instantiate) (struct dentry *dentry, struct inode *inode);
int (*getprocattr)(struct task_struct *p, char *name, char **value); int (*getprocattr) (struct task_struct *p, char *name, char **value);
int (*setprocattr)(struct task_struct *p, char *name, void *value, size_t size); int (*setprocattr) (struct task_struct *p, char *name, void *value, size_t size);
int (*secid_to_secctx)(u32 secid, char **secdata, u32 *seclen); int (*secid_to_secctx) (u32 secid, char **secdata, u32 *seclen);
int (*secctx_to_secid)(char *secdata, u32 seclen, u32 *secid); int (*secctx_to_secid) (char *secdata, u32 seclen, u32 *secid);
void (*release_secctx)(char *secdata, u32 seclen); void (*release_secctx) (char *secdata, u32 seclen);
#ifdef CONFIG_SECURITY_NETWORK #ifdef CONFIG_SECURITY_NETWORK
int (*unix_stream_connect) (struct socket * sock, int (*unix_stream_connect) (struct socket *sock,
struct socket * other, struct sock * newsk); struct socket *other, struct sock *newsk);
int (*unix_may_send) (struct socket * sock, struct socket * other); int (*unix_may_send) (struct socket *sock, struct socket *other);
int (*socket_create) (int family, int type, int protocol, int kern); int (*socket_create) (int family, int type, int protocol, int kern);
int (*socket_post_create) (struct socket * sock, int family, int (*socket_post_create) (struct socket *sock, int family,
int type, int protocol, int kern); int type, int protocol, int kern);
int (*socket_bind) (struct socket * sock, int (*socket_bind) (struct socket *sock,
struct sockaddr * address, int addrlen); struct sockaddr *address, int addrlen);
int (*socket_connect) (struct socket * sock, int (*socket_connect) (struct socket *sock,
struct sockaddr * address, int addrlen); struct sockaddr *address, int addrlen);
int (*socket_listen) (struct socket * sock, int backlog); int (*socket_listen) (struct socket *sock, int backlog);
int (*socket_accept) (struct socket * sock, struct socket * newsock); int (*socket_accept) (struct socket *sock, struct socket *newsock);
void (*socket_post_accept) (struct socket * sock, void (*socket_post_accept) (struct socket *sock,
struct socket * newsock); struct socket *newsock);
int (*socket_sendmsg) (struct socket * sock, int (*socket_sendmsg) (struct socket *sock,
struct msghdr * msg, int size); struct msghdr *msg, int size);
int (*socket_recvmsg) (struct socket * sock, int (*socket_recvmsg) (struct socket *sock,
struct msghdr * msg, int size, int flags); struct msghdr *msg, int size, int flags);
int (*socket_getsockname) (struct socket * sock); int (*socket_getsockname) (struct socket *sock);
int (*socket_getpeername) (struct socket * sock); int (*socket_getpeername) (struct socket *sock);
int (*socket_getsockopt) (struct socket * sock, int level, int optname); int (*socket_getsockopt) (struct socket *sock, int level, int optname);
int (*socket_setsockopt) (struct socket * sock, int level, int optname); int (*socket_setsockopt) (struct socket *sock, int level, int optname);
int (*socket_shutdown) (struct socket * sock, int how); int (*socket_shutdown) (struct socket *sock, int how);
int (*socket_sock_rcv_skb) (struct sock * sk, struct sk_buff * skb); int (*socket_sock_rcv_skb) (struct sock *sk, struct sk_buff *skb);
int (*socket_getpeersec_stream) (struct socket *sock, char __user *optval, int __user *optlen, unsigned len); int (*socket_getpeersec_stream) (struct socket *sock, char __user *optval, int __user *optlen, unsigned len);
int (*socket_getpeersec_dgram) (struct socket *sock, struct sk_buff *skb, u32 *secid); int (*socket_getpeersec_dgram) (struct socket *sock, struct sk_buff *skb, u32 *secid);
int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority); int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
void (*sk_free_security) (struct sock *sk); void (*sk_free_security) (struct sock *sk);
void (*sk_clone_security) (const struct sock *sk, struct sock *newsk); void (*sk_clone_security) (const struct sock *sk, struct sock *newsk);
void (*sk_getsecid) (struct sock *sk, u32 *secid); void (*sk_getsecid) (struct sock *sk, u32 *secid);
void (*sock_graft)(struct sock* sk, struct socket *parent); void (*sock_graft) (struct sock *sk, struct socket *parent);
int (*inet_conn_request)(struct sock *sk, struct sk_buff *skb, int (*inet_conn_request) (struct sock *sk, struct sk_buff *skb,
struct request_sock *req); struct request_sock *req);
void (*inet_csk_clone)(struct sock *newsk, const struct request_sock *req); void (*inet_csk_clone) (struct sock *newsk, const struct request_sock *req);
void (*inet_conn_established)(struct sock *sk, struct sk_buff *skb); void (*inet_conn_established) (struct sock *sk, struct sk_buff *skb);
void (*req_classify_flow)(const struct request_sock *req, struct flowi *fl); void (*req_classify_flow) (const struct request_sock *req, struct flowi *fl);
#endif /* CONFIG_SECURITY_NETWORK */ #endif /* CONFIG_SECURITY_NETWORK */
#ifdef CONFIG_SECURITY_NETWORK_XFRM #ifdef CONFIG_SECURITY_NETWORK_XFRM
...@@ -1523,43 +1523,43 @@ struct security_operations { ...@@ -1523,43 +1523,43 @@ struct security_operations {
u32 secid); u32 secid);
void (*xfrm_state_free_security) (struct xfrm_state *x); void (*xfrm_state_free_security) (struct xfrm_state *x);
int (*xfrm_state_delete_security) (struct xfrm_state *x); int (*xfrm_state_delete_security) (struct xfrm_state *x);
int (*xfrm_policy_lookup)(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir); int (*xfrm_policy_lookup) (struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);
int (*xfrm_state_pol_flow_match)(struct xfrm_state *x, int (*xfrm_state_pol_flow_match) (struct xfrm_state *x,
struct xfrm_policy *xp, struct flowi *fl); struct xfrm_policy *xp,
int (*xfrm_decode_session)(struct sk_buff *skb, u32 *secid, int ckall); struct flowi *fl);
int (*xfrm_decode_session) (struct sk_buff *skb, u32 *secid, int ckall);
#endif /* CONFIG_SECURITY_NETWORK_XFRM */ #endif /* CONFIG_SECURITY_NETWORK_XFRM */
/* key management security hooks */ /* key management security hooks */
#ifdef CONFIG_KEYS #ifdef CONFIG_KEYS
int (*key_alloc)(struct key *key, struct task_struct *tsk, unsigned long flags); int (*key_alloc) (struct key *key, struct task_struct *tsk, unsigned long flags);
void (*key_free)(struct key *key); void (*key_free) (struct key *key);
int (*key_permission)(key_ref_t key_ref, int (*key_permission) (key_ref_t key_ref,
struct task_struct *context, struct task_struct *context,
key_perm_t perm); key_perm_t perm);
#endif /* CONFIG_KEYS */ #endif /* CONFIG_KEYS */
#ifdef CONFIG_AUDIT #ifdef CONFIG_AUDIT
int (*audit_rule_init)(u32 field, u32 op, char *rulestr, void **lsmrule); int (*audit_rule_init) (u32 field, u32 op, char *rulestr, void **lsmrule);
int (*audit_rule_known)(struct audit_krule *krule); int (*audit_rule_known) (struct audit_krule *krule);
int (*audit_rule_match)(u32 secid, u32 field, u32 op, void *lsmrule, int (*audit_rule_match) (u32 secid, u32 field, u32 op, void *lsmrule,
struct audit_context *actx); struct audit_context *actx);
void (*audit_rule_free)(void *lsmrule); void (*audit_rule_free) (void *lsmrule);
#endif /* CONFIG_AUDIT */ #endif /* CONFIG_AUDIT */
}; };
/* prototypes */ /* prototypes */
extern int security_init (void); extern int security_init(void);
extern int security_module_enable(struct security_operations *ops); extern int security_module_enable(struct security_operations *ops);
extern int register_security (struct security_operations *ops); extern int register_security(struct security_operations *ops);
extern int mod_reg_security (const char *name, struct security_operations *ops); extern int mod_reg_security(const char *name, struct security_operations *ops);
extern struct dentry *securityfs_create_file(const char *name, mode_t mode, extern struct dentry *securityfs_create_file(const char *name, mode_t mode,
struct dentry *parent, void *data, struct dentry *parent, void *data,
const struct file_operations *fops); const struct file_operations *fops);
extern struct dentry *securityfs_create_dir(const char *name, struct dentry *parent); extern struct dentry *securityfs_create_dir(const char *name, struct dentry *parent);
extern void securityfs_remove(struct dentry *dentry); extern void securityfs_remove(struct dentry *dentry);
/* Security operations */ /* Security operations */
int security_ptrace(struct task_struct *parent, struct task_struct *child); int security_ptrace(struct task_struct *parent, struct task_struct *child);
int security_capget(struct task_struct *target, int security_capget(struct task_struct *target,
...@@ -1712,7 +1712,7 @@ int security_sem_associate(struct sem_array *sma, int semflg); ...@@ -1712,7 +1712,7 @@ int security_sem_associate(struct sem_array *sma, int semflg);
int security_sem_semctl(struct sem_array *sma, int cmd); int security_sem_semctl(struct sem_array *sma, int cmd);
int security_sem_semop(struct sem_array *sma, struct sembuf *sops, int security_sem_semop(struct sem_array *sma, struct sembuf *sops,
unsigned nsops, int alter); unsigned nsops, int alter);
void security_d_instantiate (struct dentry *dentry, struct inode *inode); void security_d_instantiate(struct dentry *dentry, struct inode *inode);
int security_getprocattr(struct task_struct *p, char *name, char **value); int security_getprocattr(struct task_struct *p, char *name, char **value);
int security_setprocattr(struct task_struct *p, char *name, void *value, size_t size); int security_setprocattr(struct task_struct *p, char *name, void *value, size_t size);
int security_netlink_send(struct sock *sk, struct sk_buff *skb); int security_netlink_send(struct sock *sk, struct sk_buff *skb);
...@@ -1743,33 +1743,33 @@ static inline int security_init(void) ...@@ -1743,33 +1743,33 @@ static inline int security_init(void)
return 0; return 0;
} }
static inline int security_ptrace (struct task_struct *parent, struct task_struct * child) static inline int security_ptrace(struct task_struct *parent, struct task_struct *child)
{ {
return cap_ptrace (parent, child); return cap_ptrace(parent, child);
} }
static inline int security_capget (struct task_struct *target, static inline int security_capget(struct task_struct *target,
kernel_cap_t *effective, kernel_cap_t *effective,
kernel_cap_t *inheritable, kernel_cap_t *inheritable,
kernel_cap_t *permitted) kernel_cap_t *permitted)
{ {
return cap_capget (target, effective, inheritable, permitted); return cap_capget(target, effective, inheritable, permitted);
} }
static inline int security_capset_check (struct task_struct *target, static inline int security_capset_check(struct task_struct *target,
kernel_cap_t *effective, kernel_cap_t *effective,
kernel_cap_t *inheritable, kernel_cap_t *inheritable,
kernel_cap_t *permitted) kernel_cap_t *permitted)
{ {
return cap_capset_check (target, effective, inheritable, permitted); return cap_capset_check(target, effective, inheritable, permitted);
} }
static inline void security_capset_set (struct task_struct *target, static inline void security_capset_set(struct task_struct *target,
kernel_cap_t *effective, kernel_cap_t *effective,
kernel_cap_t *inheritable, kernel_cap_t *inheritable,
kernel_cap_t *permitted) kernel_cap_t *permitted)
{ {
cap_capset_set (target, effective, inheritable, permitted); cap_capset_set(target, effective, inheritable, permitted);
} }
static inline int security_capable(struct task_struct *tsk, int cap) static inline int security_capable(struct task_struct *tsk, int cap)
...@@ -1777,7 +1777,7 @@ static inline int security_capable(struct task_struct *tsk, int cap) ...@@ -1777,7 +1777,7 @@ static inline int security_capable(struct task_struct *tsk, int cap)
return cap_capable(tsk, cap); return cap_capable(tsk, cap);
} }
static inline int security_acct (struct file *file) static inline int security_acct(struct file *file)
{ {
return 0; return 0;
} }
...@@ -1787,13 +1787,13 @@ static inline int security_sysctl(struct ctl_table *table, int op) ...@@ -1787,13 +1787,13 @@ static inline int security_sysctl(struct ctl_table *table, int op)
return 0; return 0;
} }
static inline int security_quotactl (int cmds, int type, int id, static inline int security_quotactl(int cmds, int type, int id,
struct super_block * sb) struct super_block *sb)
{ {
return 0; return 0;
} }
static inline int security_quota_on (struct dentry * dentry) static inline int security_quota_on(struct dentry *dentry)
{ {
return 0; return 0;
} }
...@@ -1818,101 +1818,101 @@ static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) ...@@ -1818,101 +1818,101 @@ static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
return cap_vm_enough_memory(mm, pages); return cap_vm_enough_memory(mm, pages);
} }
static inline int security_bprm_alloc (struct linux_binprm *bprm) static inline int security_bprm_alloc(struct linux_binprm *bprm)
{ {
return 0; return 0;
} }
static inline void security_bprm_free (struct linux_binprm *bprm) static inline void security_bprm_free(struct linux_binprm *bprm)
{ } { }
static inline void security_bprm_apply_creds (struct linux_binprm *bprm, int unsafe) static inline void security_bprm_apply_creds(struct linux_binprm *bprm, int unsafe)
{ {
cap_bprm_apply_creds (bprm, unsafe); cap_bprm_apply_creds(bprm, unsafe);
} }
static inline void security_bprm_post_apply_creds (struct linux_binprm *bprm) static inline void security_bprm_post_apply_creds(struct linux_binprm *bprm)
{ {
return; return;
} }
static inline int security_bprm_set (struct linux_binprm *bprm) static inline int security_bprm_set(struct linux_binprm *bprm)
{ {
return cap_bprm_set_security (bprm); return cap_bprm_set_security(bprm);
} }
static inline int security_bprm_check (struct linux_binprm *bprm) static inline int security_bprm_check(struct linux_binprm *bprm)
{ {
return 0; return 0;
} }
static inline int security_bprm_secureexec (struct linux_binprm *bprm) static inline int security_bprm_secureexec(struct linux_binprm *bprm)
{ {
return cap_bprm_secureexec(bprm); return cap_bprm_secureexec(bprm);
} }
static inline int security_sb_alloc (struct super_block *sb) static inline int security_sb_alloc(struct super_block *sb)
{ {
return 0; return 0;
} }
static inline void security_sb_free (struct super_block *sb) static inline void security_sb_free(struct super_block *sb)
{ } { }
static inline int security_sb_copy_data (char *orig, char *copy) static inline int security_sb_copy_data(char *orig, char *copy)
{ {
return 0; return 0;
} }
static inline int security_sb_kern_mount (struct super_block *sb, void *data) static inline int security_sb_kern_mount(struct super_block *sb, void *data)
{ {
return 0; return 0;
} }
static inline int security_sb_statfs (struct dentry *dentry) static inline int security_sb_statfs(struct dentry *dentry)
{ {
return 0; return 0;
} }
static inline int security_sb_mount (char *dev_name, struct path *path, static inline int security_sb_mount(char *dev_name, struct path *path,
char *type, unsigned long flags, char *type, unsigned long flags,
void *data) void *data)
{ {
return 0; return 0;
} }
static inline int security_sb_check_sb (struct vfsmount *mnt, static inline int security_sb_check_sb(struct vfsmount *mnt,
struct path *path) struct path *path)
{ {
return 0; return 0;
} }
static inline int security_sb_umount (struct vfsmount *mnt, int flags) static inline int security_sb_umount(struct vfsmount *mnt, int flags)
{ {
return 0; return 0;
} }
static inline void security_sb_umount_close (struct vfsmount *mnt) static inline void security_sb_umount_close(struct vfsmount *mnt)
{ } { }
static inline void security_sb_umount_busy (struct vfsmount *mnt) static inline void security_sb_umount_busy(struct vfsmount *mnt)
{ } { }
static inline void security_sb_post_remount (struct vfsmount *mnt, static inline void security_sb_post_remount(struct vfsmount *mnt,
unsigned long flags, void *data) unsigned long flags, void *data)
{ } { }
static inline void security_sb_post_addmount (struct vfsmount *mnt, static inline void security_sb_post_addmount(struct vfsmount *mnt,
struct path *mountpoint) struct path *mountpoint)
{ } { }
static inline int security_sb_pivotroot (struct path *old_path, static inline int security_sb_pivotroot(struct path *old_path,
struct path *new_path) struct path *new_path)
{ {
return 0; return 0;
} }
static inline void security_sb_post_pivotroot (struct path *old_path, static inline void security_sb_post_pivotroot(struct path *old_path,
struct path *new_path) struct path *new_path)
{ } { }
static inline int security_sb_get_mnt_opts(const struct super_block *sb, static inline int security_sb_get_mnt_opts(const struct super_block *sb,
...@@ -1937,15 +1937,15 @@ static inline int security_sb_parse_opts_str(char *options, struct security_mnt_ ...@@ -1937,15 +1937,15 @@ static inline int security_sb_parse_opts_str(char *options, struct security_mnt_
return 0; return 0;
} }
static inline int security_inode_alloc (struct inode *inode) static inline int security_inode_alloc(struct inode *inode)
{ {
return 0; return 0;
} }
static inline void security_inode_free (struct inode *inode) static inline void security_inode_free(struct inode *inode)
{ } { }
static inline int security_inode_init_security (struct inode *inode, static inline int security_inode_init_security(struct inode *inode,
struct inode *dir, struct inode *dir,
char **name, char **name,
void **value, void **value,
...@@ -1954,54 +1954,54 @@ static inline int security_inode_init_security (struct inode *inode, ...@@ -1954,54 +1954,54 @@ static inline int security_inode_init_security (struct inode *inode,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int security_inode_create (struct inode *dir, static inline int security_inode_create(struct inode *dir,
struct dentry *dentry, struct dentry *dentry,
int mode) int mode)
{ {
return 0; return 0;
} }
static inline int security_inode_link (struct dentry *old_dentry, static inline int security_inode_link(struct dentry *old_dentry,
struct inode *dir, struct inode *dir,
struct dentry *new_dentry) struct dentry *new_dentry)
{ {
return 0; return 0;
} }
static inline int security_inode_unlink (struct inode *dir, static inline int security_inode_unlink(struct inode *dir,
struct dentry *dentry) struct dentry *dentry)
{ {
return 0; return 0;
} }
static inline int security_inode_symlink (struct inode *dir, static inline int security_inode_symlink(struct inode *dir,
struct dentry *dentry, struct dentry *dentry,
const char *old_name) const char *old_name)
{ {
return 0; return 0;
} }
static inline int security_inode_mkdir (struct inode *dir, static inline int security_inode_mkdir(struct inode *dir,
struct dentry *dentry, struct dentry *dentry,
int mode) int mode)
{ {
return 0; return 0;
} }
static inline int security_inode_rmdir (struct inode *dir, static inline int security_inode_rmdir(struct inode *dir,
struct dentry *dentry) struct dentry *dentry)
{ {
return 0; return 0;
} }
static inline int security_inode_mknod (struct inode *dir, static inline int security_inode_mknod(struct inode *dir,
struct dentry *dentry, struct dentry *dentry,
int mode, dev_t dev) int mode, dev_t dev)
{ {
return 0; return 0;
} }
static inline int security_inode_rename (struct inode *old_dir, static inline int security_inode_rename(struct inode *old_dir,
struct dentry *old_dentry, struct dentry *old_dentry,
struct inode *new_dir, struct inode *new_dir,
struct dentry *new_dentry) struct dentry *new_dentry)
...@@ -2009,59 +2009,59 @@ static inline int security_inode_rename (struct inode *old_dir, ...@@ -2009,59 +2009,59 @@ static inline int security_inode_rename (struct inode *old_dir,
return 0; return 0;
} }
static inline int security_inode_readlink (struct dentry *dentry) static inline int security_inode_readlink(struct dentry *dentry)
{ {
return 0; return 0;
} }
static inline int security_inode_follow_link (struct dentry *dentry, static inline int security_inode_follow_link(struct dentry *dentry,
struct nameidata *nd) struct nameidata *nd)
{ {
return 0; return 0;
} }
static inline int security_inode_permission (struct inode *inode, int mask, static inline int security_inode_permission(struct inode *inode, int mask,
struct nameidata *nd) struct nameidata *nd)
{ {
return 0; return 0;
} }
static inline int security_inode_setattr (struct dentry *dentry, static inline int security_inode_setattr(struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
return 0; return 0;
} }
static inline int security_inode_getattr (struct vfsmount *mnt, static inline int security_inode_getattr(struct vfsmount *mnt,
struct dentry *dentry) struct dentry *dentry)
{ {
return 0; return 0;
} }
static inline void security_inode_delete (struct inode *inode) static inline void security_inode_delete(struct inode *inode)
{ } { }
static inline int security_inode_setxattr (struct dentry *dentry, char *name, static inline int security_inode_setxattr(struct dentry *dentry, char *name,
void *value, size_t size, int flags) void *value, size_t size, int flags)
{ {
return cap_inode_setxattr(dentry, name, value, size, flags); return cap_inode_setxattr(dentry, name, value, size, flags);
} }
static inline void security_inode_post_setxattr (struct dentry *dentry, char *name, static inline void security_inode_post_setxattr(struct dentry *dentry, char *name,
void *value, size_t size, int flags) void *value, size_t size, int flags)
{ } { }
static inline int security_inode_getxattr (struct dentry *dentry, char *name) static inline int security_inode_getxattr(struct dentry *dentry, char *name)
{ {
return 0; return 0;
} }
static inline int security_inode_listxattr (struct dentry *dentry) static inline int security_inode_listxattr(struct dentry *dentry)
{ {
return 0; return 0;
} }
static inline int security_inode_removexattr (struct dentry *dentry, char *name) static inline int security_inode_removexattr(struct dentry *dentry, char *name)
{ {
return cap_inode_removexattr(dentry, name); return cap_inode_removexattr(dentry, name);
} }
...@@ -2096,26 +2096,26 @@ static inline void security_inode_getsecid(const struct inode *inode, u32 *secid ...@@ -2096,26 +2096,26 @@ static inline void security_inode_getsecid(const struct inode *inode, u32 *secid
*secid = 0; *secid = 0;
} }
static inline int security_file_permission (struct file *file, int mask) static inline int security_file_permission(struct file *file, int mask)
{ {
return 0; return 0;
} }
static inline int security_file_alloc (struct file *file) static inline int security_file_alloc(struct file *file)
{ {
return 0; return 0;
} }
static inline void security_file_free (struct file *file) static inline void security_file_free(struct file *file)
{ } { }
static inline int security_file_ioctl (struct file *file, unsigned int cmd, static inline int security_file_ioctl(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
return 0; return 0;
} }
static inline int security_file_mmap (struct file *file, unsigned long reqprot, static inline int security_file_mmap(struct file *file, unsigned long reqprot,
unsigned long prot, unsigned long prot,
unsigned long flags, unsigned long flags,
unsigned long addr, unsigned long addr,
...@@ -2124,153 +2124,153 @@ static inline int security_file_mmap (struct file *file, unsigned long reqprot, ...@@ -2124,153 +2124,153 @@ static inline int security_file_mmap (struct file *file, unsigned long reqprot,
return 0; return 0;
} }
static inline int security_file_mprotect (struct vm_area_struct *vma, static inline int security_file_mprotect(struct vm_area_struct *vma,
unsigned long reqprot, unsigned long reqprot,
unsigned long prot) unsigned long prot)
{ {
return 0; return 0;
} }
static inline int security_file_lock (struct file *file, unsigned int cmd) static inline int security_file_lock(struct file *file, unsigned int cmd)
{ {
return 0; return 0;
} }
static inline int security_file_fcntl (struct file *file, unsigned int cmd, static inline int security_file_fcntl(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
return 0; return 0;
} }
static inline int security_file_set_fowner (struct file *file) static inline int security_file_set_fowner(struct file *file)
{ {
return 0; return 0;
} }
static inline int security_file_send_sigiotask (struct task_struct *tsk, static inline int security_file_send_sigiotask(struct task_struct *tsk,
struct fown_struct *fown, struct fown_struct *fown,
int sig) int sig)
{ {
return 0; return 0;
} }
static inline int security_file_receive (struct file *file) static inline int security_file_receive(struct file *file)
{ {
return 0; return 0;
} }
static inline int security_dentry_open (struct file *file) static inline int security_dentry_open(struct file *file)
{ {
return 0; return 0;
} }
static inline int security_task_create (unsigned long clone_flags) static inline int security_task_create(unsigned long clone_flags)
{ {
return 0; return 0;
} }
static inline int security_task_alloc (struct task_struct *p) static inline int security_task_alloc(struct task_struct *p)
{ {
return 0; return 0;
} }
static inline void security_task_free (struct task_struct *p) static inline void security_task_free(struct task_struct *p)
{ } { }
static inline int security_task_setuid (uid_t id0, uid_t id1, uid_t id2, static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2,
int flags) int flags)
{ {
return 0; return 0;
} }
static inline int security_task_post_setuid (uid_t old_ruid, uid_t old_euid, static inline int security_task_post_setuid(uid_t old_ruid, uid_t old_euid,
uid_t old_suid, int flags) uid_t old_suid, int flags)
{ {
return cap_task_post_setuid (old_ruid, old_euid, old_suid, flags); return cap_task_post_setuid(old_ruid, old_euid, old_suid, flags);
} }
static inline int security_task_setgid (gid_t id0, gid_t id1, gid_t id2, static inline int security_task_setgid(gid_t id0, gid_t id1, gid_t id2,
int flags) int flags)
{ {
return 0; return 0;
} }
static inline int security_task_setpgid (struct task_struct *p, pid_t pgid) static inline int security_task_setpgid(struct task_struct *p, pid_t pgid)
{ {
return 0; return 0;
} }
static inline int security_task_getpgid (struct task_struct *p) static inline int security_task_getpgid(struct task_struct *p)
{ {
return 0; return 0;
} }
static inline int security_task_getsid (struct task_struct *p) static inline int security_task_getsid(struct task_struct *p)
{ {
return 0; return 0;
} }
static inline void security_task_getsecid (struct task_struct *p, u32 *secid) static inline void security_task_getsecid(struct task_struct *p, u32 *secid)
{ {
*secid = 0; *secid = 0;
} }
static inline int security_task_setgroups (struct group_info *group_info) static inline int security_task_setgroups(struct group_info *group_info)
{ {
return 0; return 0;
} }
static inline int security_task_setnice (struct task_struct *p, int nice) static inline int security_task_setnice(struct task_struct *p, int nice)
{ {
return cap_task_setnice(p, nice); return cap_task_setnice(p, nice);
} }
static inline int security_task_setioprio (struct task_struct *p, int ioprio) static inline int security_task_setioprio(struct task_struct *p, int ioprio)
{ {
return cap_task_setioprio(p, ioprio); return cap_task_setioprio(p, ioprio);
} }
static inline int security_task_getioprio (struct task_struct *p) static inline int security_task_getioprio(struct task_struct *p)
{ {
return 0; return 0;
} }
static inline int security_task_setrlimit (unsigned int resource, static inline int security_task_setrlimit(unsigned int resource,
struct rlimit *new_rlim) struct rlimit *new_rlim)
{ {
return 0; return 0;
} }
static inline int security_task_setscheduler (struct task_struct *p, static inline int security_task_setscheduler(struct task_struct *p,
int policy, int policy,
struct sched_param *lp) struct sched_param *lp)
{ {
return cap_task_setscheduler(p, policy, lp); return cap_task_setscheduler(p, policy, lp);
} }
static inline int security_task_getscheduler (struct task_struct *p) static inline int security_task_getscheduler(struct task_struct *p)
{ {
return 0; return 0;
} }
static inline int security_task_movememory (struct task_struct *p) static inline int security_task_movememory(struct task_struct *p)
{ {
return 0; return 0;
} }
static inline int security_task_kill (struct task_struct *p, static inline int security_task_kill(struct task_struct *p,
struct siginfo *info, int sig, struct siginfo *info, int sig,
u32 secid) u32 secid)
{ {
return 0; return 0;
} }
static inline int security_task_wait (struct task_struct *p) static inline int security_task_wait(struct task_struct *p)
{ {
return 0; return 0;
} }
static inline int security_task_prctl (int option, unsigned long arg2, static inline int security_task_prctl(int option, unsigned long arg2,
unsigned long arg3, unsigned long arg3,
unsigned long arg4, unsigned long arg4,
unsigned long arg5, long *rc_p) unsigned long arg5, long *rc_p)
...@@ -2278,15 +2278,15 @@ static inline int security_task_prctl (int option, unsigned long arg2, ...@@ -2278,15 +2278,15 @@ static inline int security_task_prctl (int option, unsigned long arg2,
return cap_task_prctl(option, arg2, arg3, arg3, arg5, rc_p); return cap_task_prctl(option, arg2, arg3, arg3, arg5, rc_p);
} }
static inline void security_task_reparent_to_init (struct task_struct *p) static inline void security_task_reparent_to_init(struct task_struct *p)
{ {
cap_task_reparent_to_init (p); cap_task_reparent_to_init(p);
} }
static inline void security_task_to_inode(struct task_struct *p, struct inode *inode) static inline void security_task_to_inode(struct task_struct *p, struct inode *inode)
{ } { }
static inline int security_ipc_permission (struct kern_ipc_perm *ipcp, static inline int security_ipc_permission(struct kern_ipc_perm *ipcp,
short flag) short flag)
{ {
return 0; return 0;
...@@ -2297,98 +2297,98 @@ static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid) ...@@ -2297,98 +2297,98 @@ static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)
*secid = 0; *secid = 0;
} }
static inline int security_msg_msg_alloc (struct msg_msg * msg) static inline int security_msg_msg_alloc(struct msg_msg *msg)
{ {
return 0; return 0;
} }
static inline void security_msg_msg_free (struct msg_msg * msg) static inline void security_msg_msg_free(struct msg_msg *msg)
{ } { }
static inline int security_msg_queue_alloc (struct msg_queue *msq) static inline int security_msg_queue_alloc(struct msg_queue *msq)
{ {
return 0; return 0;
} }
static inline void security_msg_queue_free (struct msg_queue *msq) static inline void security_msg_queue_free(struct msg_queue *msq)
{ } { }
static inline int security_msg_queue_associate (struct msg_queue * msq, static inline int security_msg_queue_associate(struct msg_queue *msq,
int msqflg) int msqflg)
{ {
return 0; return 0;
} }
static inline int security_msg_queue_msgctl (struct msg_queue * msq, int cmd) static inline int security_msg_queue_msgctl(struct msg_queue *msq, int cmd)
{ {
return 0; return 0;
} }
static inline int security_msg_queue_msgsnd (struct msg_queue * msq, static inline int security_msg_queue_msgsnd(struct msg_queue *msq,
struct msg_msg * msg, int msqflg) struct msg_msg *msg, int msqflg)
{ {
return 0; return 0;
} }
static inline int security_msg_queue_msgrcv (struct msg_queue * msq, static inline int security_msg_queue_msgrcv(struct msg_queue *msq,
struct msg_msg * msg, struct msg_msg *msg,
struct task_struct * target, struct task_struct *target,
long type, int mode) long type, int mode)
{ {
return 0; return 0;
} }
static inline int security_shm_alloc (struct shmid_kernel *shp) static inline int security_shm_alloc(struct shmid_kernel *shp)
{ {
return 0; return 0;
} }
static inline void security_shm_free (struct shmid_kernel *shp) static inline void security_shm_free(struct shmid_kernel *shp)
{ } { }
static inline int security_shm_associate (struct shmid_kernel * shp, static inline int security_shm_associate(struct shmid_kernel *shp,
int shmflg) int shmflg)
{ {
return 0; return 0;
} }
static inline int security_shm_shmctl (struct shmid_kernel * shp, int cmd) static inline int security_shm_shmctl(struct shmid_kernel *shp, int cmd)
{ {
return 0; return 0;
} }
static inline int security_shm_shmat (struct shmid_kernel * shp, static inline int security_shm_shmat(struct shmid_kernel *shp,
char __user *shmaddr, int shmflg) char __user *shmaddr, int shmflg)
{ {
return 0; return 0;
} }
static inline int security_sem_alloc (struct sem_array *sma) static inline int security_sem_alloc(struct sem_array *sma)
{ {
return 0; return 0;
} }
static inline void security_sem_free (struct sem_array *sma) static inline void security_sem_free(struct sem_array *sma)
{ } { }
static inline int security_sem_associate (struct sem_array * sma, int semflg) static inline int security_sem_associate(struct sem_array *sma, int semflg)
{ {
return 0; return 0;
} }
static inline int security_sem_semctl (struct sem_array * sma, int cmd) static inline int security_sem_semctl(struct sem_array *sma, int cmd)
{ {
return 0; return 0;
} }
static inline int security_sem_semop (struct sem_array * sma, static inline int security_sem_semop(struct sem_array *sma,
struct sembuf * sops, unsigned nsops, struct sembuf *sops, unsigned nsops,
int alter) int alter)
{ {
return 0; return 0;
} }
static inline void security_d_instantiate (struct dentry *dentry, struct inode *inode) static inline void security_d_instantiate(struct dentry *dentry, struct inode *inode)
{ } { }
static inline int security_getprocattr(struct task_struct *p, char *name, char **value) static inline int security_getprocattr(struct task_struct *p, char *name, char **value)
...@@ -2401,14 +2401,14 @@ static inline int security_setprocattr(struct task_struct *p, char *name, void * ...@@ -2401,14 +2401,14 @@ static inline int security_setprocattr(struct task_struct *p, char *name, void *
return -EINVAL; return -EINVAL;
} }
static inline int security_netlink_send (struct sock *sk, struct sk_buff *skb) static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb)
{ {
return cap_netlink_send (sk, skb); return cap_netlink_send(sk, skb);
} }
static inline int security_netlink_recv (struct sk_buff *skb, int cap) static inline int security_netlink_recv(struct sk_buff *skb, int cap)
{ {
return cap_netlink_recv (skb, cap); return cap_netlink_recv(skb, cap);
} }
static inline struct dentry *securityfs_create_dir(const char *name, static inline struct dentry *securityfs_create_dir(const char *name,
...@@ -2486,26 +2486,26 @@ void security_inet_conn_established(struct sock *sk, ...@@ -2486,26 +2486,26 @@ void security_inet_conn_established(struct sock *sk,
struct sk_buff *skb); struct sk_buff *skb);
#else /* CONFIG_SECURITY_NETWORK */ #else /* CONFIG_SECURITY_NETWORK */
static inline int security_unix_stream_connect(struct socket * sock, static inline int security_unix_stream_connect(struct socket *sock,
struct socket * other, struct socket *other,
struct sock * newsk) struct sock *newsk)
{ {
return 0; return 0;
} }
static inline int security_unix_may_send(struct socket * sock, static inline int security_unix_may_send(struct socket *sock,
struct socket * other) struct socket *other)
{ {
return 0; return 0;
} }
static inline int security_socket_create (int family, int type, static inline int security_socket_create(int family, int type,
int protocol, int kern) int protocol, int kern)
{ {
return 0; return 0;
} }
static inline int security_socket_post_create(struct socket * sock, static inline int security_socket_post_create(struct socket *sock,
int family, int family,
int type, int type,
int protocol, int kern) int protocol, int kern)
...@@ -2513,77 +2513,77 @@ static inline int security_socket_post_create(struct socket * sock, ...@@ -2513,77 +2513,77 @@ static inline int security_socket_post_create(struct socket * sock,
return 0; return 0;
} }
static inline int security_socket_bind(struct socket * sock, static inline int security_socket_bind(struct socket *sock,
struct sockaddr * address, struct sockaddr *address,
int addrlen) int addrlen)
{ {
return 0; return 0;
} }
static inline int security_socket_connect(struct socket * sock, static inline int security_socket_connect(struct socket *sock,
struct sockaddr * address, struct sockaddr *address,
int addrlen) int addrlen)
{ {
return 0; return 0;
} }
static inline int security_socket_listen(struct socket * sock, int backlog) static inline int security_socket_listen(struct socket *sock, int backlog)
{ {
return 0; return 0;
} }
static inline int security_socket_accept(struct socket * sock, static inline int security_socket_accept(struct socket *sock,
struct socket * newsock) struct socket *newsock)
{ {
return 0; return 0;
} }
static inline void security_socket_post_accept(struct socket * sock, static inline void security_socket_post_accept(struct socket *sock,
struct socket * newsock) struct socket *newsock)
{ {
} }
static inline int security_socket_sendmsg(struct socket * sock, static inline int security_socket_sendmsg(struct socket *sock,
struct msghdr * msg, int size) struct msghdr *msg, int size)
{ {
return 0; return 0;
} }
static inline int security_socket_recvmsg(struct socket * sock, static inline int security_socket_recvmsg(struct socket *sock,
struct msghdr * msg, int size, struct msghdr *msg, int size,
int flags) int flags)
{ {
return 0; return 0;
} }
static inline int security_socket_getsockname(struct socket * sock) static inline int security_socket_getsockname(struct socket *sock)
{ {
return 0; return 0;
} }
static inline int security_socket_getpeername(struct socket * sock) static inline int security_socket_getpeername(struct socket *sock)
{ {
return 0; return 0;
} }
static inline int security_socket_getsockopt(struct socket * sock, static inline int security_socket_getsockopt(struct socket *sock,
int level, int optname) int level, int optname)
{ {
return 0; return 0;
} }
static inline int security_socket_setsockopt(struct socket * sock, static inline int security_socket_setsockopt(struct socket *sock,
int level, int optname) int level, int optname)
{ {
return 0; return 0;
} }
static inline int security_socket_shutdown(struct socket * sock, int how) static inline int security_socket_shutdown(struct socket *sock, int how)
{ {
return 0; return 0;
} }
static inline int security_sock_rcv_skb (struct sock * sk, static inline int security_sock_rcv_skb(struct sock *sk,
struct sk_buff * skb) struct sk_buff *skb)
{ {
return 0; return 0;
} }
...@@ -2620,7 +2620,7 @@ static inline void security_req_classify_flow(const struct request_sock *req, st ...@@ -2620,7 +2620,7 @@ static inline void security_req_classify_flow(const struct request_sock *req, st
{ {
} }
static inline void security_sock_graft(struct sock* sk, struct socket *parent) static inline void security_sock_graft(struct sock *sk, struct socket *parent)
{ {
} }
......
security/selinux/include/avc_ss.h
View file @ cfd299df
...@@ -10,22 +10,19 @@ ...@@ -10,22 +10,19 @@
int avc_ss_reset(u32 seqno); int avc_ss_reset(u32 seqno);
struct av_perm_to_string struct av_perm_to_string {
{
u16 tclass; u16 tclass;
u32 value; u32 value;
const char *name; const char *name;
}; };
struct av_inherit struct av_inherit {
{
u16 tclass; u16 tclass;
const char **common_pts; const char **common_pts;
u32 common_base; u32 common_base;
}; };
struct selinux_class_perm struct selinux_class_perm {
{
const struct av_perm_to_string *av_perm_to_string; const struct av_perm_to_string *av_perm_to_string;
u32 av_pts_len; u32 av_pts_len;
const char **class_to_string; const char **class_to_string;
......
security/selinux/include/security.h
View file @ cfd299df
...@@ -62,7 +62,7 @@ enum { ...@@ -62,7 +62,7 @@ enum {
extern int selinux_policycap_netpeer; extern int selinux_policycap_netpeer;
extern int selinux_policycap_openperm; extern int selinux_policycap_openperm;
int security_load_policy(void * data, size_t len); int security_load_policy(void *data, size_t len);
int security_policycap_supported(unsigned int req_cap); int security_policycap_supported(unsigned int req_cap);
......
security/selinux/netnode.c
View file @ cfd299df
...@@ -40,11 +40,17 @@ ...@@ -40,11 +40,17 @@
#include <net/ipv6.h> #include <net/ipv6.h>
#include <asm/bug.h> #include <asm/bug.h>
#include "netnode.h"
#include "objsec.h" #include "objsec.h"
#define SEL_NETNODE_HASH_SIZE 256 #define SEL_NETNODE_HASH_SIZE 256
#define SEL_NETNODE_HASH_BKT_LIMIT 16 #define SEL_NETNODE_HASH_BKT_LIMIT 16
struct sel_netnode_bkt {
unsigned int size;
struct list_head list;
};
struct sel_netnode { struct sel_netnode {
struct netnode_security_struct nsec; struct netnode_security_struct nsec;
...@@ -60,7 +66,7 @@ struct sel_netnode { ...@@ -60,7 +66,7 @@ struct sel_netnode {
static LIST_HEAD(sel_netnode_list); static LIST_HEAD(sel_netnode_list);
static DEFINE_SPINLOCK(sel_netnode_lock); static DEFINE_SPINLOCK(sel_netnode_lock);
static struct list_head sel_netnode_hash[SEL_NETNODE_HASH_SIZE]; static struct sel_netnode_bkt sel_netnode_hash[SEL_NETNODE_HASH_SIZE];
/** /**
* sel_netnode_free - Frees a node entry * sel_netnode_free - Frees a node entry
...@@ -87,7 +93,7 @@ static void sel_netnode_free(struct rcu_head *p) ...@@ -87,7 +93,7 @@ static void sel_netnode_free(struct rcu_head *p)
* the bucket number for the given IP address. * the bucket number for the given IP address.
* *
*/ */
static u32 sel_netnode_hashfn_ipv4(__be32 addr) static unsigned int sel_netnode_hashfn_ipv4(__be32 addr)
{ {
/* at some point we should determine if the mismatch in byte order /* at some point we should determine if the mismatch in byte order
* affects the hash function dramatically */ * affects the hash function dramatically */
...@@ -103,7 +109,7 @@ static u32 sel_netnode_hashfn_ipv4(__be32 addr) ...@@ -103,7 +109,7 @@ static u32 sel_netnode_hashfn_ipv4(__be32 addr)
* the bucket number for the given IP address. * the bucket number for the given IP address.
* *
*/ */
static u32 sel_netnode_hashfn_ipv6(const struct in6_addr *addr) static unsigned int sel_netnode_hashfn_ipv6(const struct in6_addr *addr)
{ {
/* just hash the least significant 32 bits to keep things fast (they /* just hash the least significant 32 bits to keep things fast (they
* are the most likely to be different anyway), we can revisit this * are the most likely to be different anyway), we can revisit this
...@@ -123,7 +129,7 @@ static u32 sel_netnode_hashfn_ipv6(const struct in6_addr *addr) ...@@ -123,7 +129,7 @@ static u32 sel_netnode_hashfn_ipv6(const struct in6_addr *addr)
*/ */
static struct sel_netnode *sel_netnode_find(const void *addr, u16 family) static struct sel_netnode *sel_netnode_find(const void *addr, u16 family)
{ {
u32 idx; unsigned int idx;
struct sel_netnode *node; struct sel_netnode *node;
switch (family) { switch (family) {
...@@ -137,7 +143,7 @@ static struct sel_netnode *sel_netnode_find(const void *addr, u16 family) ...@@ -137,7 +143,7 @@ static struct sel_netnode *sel_netnode_find(const void *addr, u16 family)
BUG(); BUG();
} }
list_for_each_entry_rcu(node, &sel_netnode_hash[idx], list) list_for_each_entry_rcu(node, &sel_netnode_hash[idx].list, list)
if (node->nsec.family == family) if (node->nsec.family == family)
switch (family) { switch (family) {
case PF_INET: case PF_INET:
...@@ -159,15 +165,12 @@ static struct sel_netnode *sel_netnode_find(const void *addr, u16 family) ...@@ -159,15 +165,12 @@ static struct sel_netnode *sel_netnode_find(const void *addr, u16 family)
* @node: the new node record * @node: the new node record
* *
* Description: * Description:
* Add a new node record to the network address hash table. Returns zero on * Add a new node record to the network address hash table.
* success, negative values on failure.
* *
*/ */
static int sel_netnode_insert(struct sel_netnode *node) static void sel_netnode_insert(struct sel_netnode *node)
{ {
u32 idx; unsigned int idx;
u32 count = 0;
struct sel_netnode *iter;
switch (node->nsec.family) { switch (node->nsec.family) {
case PF_INET: case PF_INET:
...@@ -179,32 +182,21 @@ static int sel_netnode_insert(struct sel_netnode *node) ...@@ -179,32 +182,21 @@ static int sel_netnode_insert(struct sel_netnode *node)
default: default:
BUG(); BUG();
} }
list_add_rcu(&node->list, &sel_netnode_hash[idx]);
INIT_RCU_HEAD(&node->rcu);
/* we need to impose a limit on the growth of the hash table so check /* we need to impose a limit on the growth of the hash table so check
* this bucket to make sure it is within the specified bounds */ * this bucket to make sure it is within the specified bounds */
list_for_each_entry(iter, &sel_netnode_hash[idx], list) list_add_rcu(&node->list, &sel_netnode_hash[idx].list);
if (++count > SEL_NETNODE_HASH_BKT_LIMIT) { if (sel_netnode_hash[idx].size == SEL_NETNODE_HASH_BKT_LIMIT) {
list_del_rcu(&iter->list); struct sel_netnode *tail;
call_rcu(&iter->rcu, sel_netnode_free); tail = list_entry(
break; rcu_dereference(sel_netnode_hash[idx].list.prev),
} struct sel_netnode, list);
list_del_rcu(&tail->list);
return 0; call_rcu(&tail->rcu, sel_netnode_free);
} } else
sel_netnode_hash[idx].size++;
/**
* sel_netnode_destroy - Remove a node record from the table
* @node: the existing node record
*
* Description:
* Remove an existing node record from the network address table.
*
*/
static void sel_netnode_destroy(struct sel_netnode *node)
{
list_del_rcu(&node->list);
call_rcu(&node->rcu, sel_netnode_free);
} }
/** /**
...@@ -222,7 +214,7 @@ static void sel_netnode_destroy(struct sel_netnode *node) ...@@ -222,7 +214,7 @@ static void sel_netnode_destroy(struct sel_netnode *node)
*/ */
static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid) static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
{ {
int ret; int ret = -ENOMEM;
struct sel_netnode *node; struct sel_netnode *node;
struct sel_netnode *new = NULL; struct sel_netnode *new = NULL;
...@@ -230,25 +222,21 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid) ...@@ -230,25 +222,21 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
node = sel_netnode_find(addr, family); node = sel_netnode_find(addr, family);
if (node != NULL) { if (node != NULL) {
*sid = node->nsec.sid; *sid = node->nsec.sid;
ret = 0; spin_unlock_bh(&sel_netnode_lock);
goto out; return 0;
} }
new = kzalloc(sizeof(*new), GFP_ATOMIC); new = kzalloc(sizeof(*new), GFP_ATOMIC);
if (new == NULL) { if (new == NULL)
ret = -ENOMEM;
goto out; goto out;
}
switch (family) { switch (family) {
case PF_INET: case PF_INET:
ret = security_node_sid(PF_INET, ret = security_node_sid(PF_INET,
addr, sizeof(struct in_addr), addr, sizeof(struct in_addr), sid);
&new->nsec.sid);
new->nsec.addr.ipv4 = *(__be32 *)addr; new->nsec.addr.ipv4 = *(__be32 *)addr;
break; break;
case PF_INET6: case PF_INET6:
ret = security_node_sid(PF_INET6, ret = security_node_sid(PF_INET6,
addr, sizeof(struct in6_addr), addr, sizeof(struct in6_addr), sid);
&new->nsec.sid);
ipv6_addr_copy(&new->nsec.addr.ipv6, addr); ipv6_addr_copy(&new->nsec.addr.ipv6, addr);
break; break;
default: default:
...@@ -256,11 +244,10 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid) ...@@ -256,11 +244,10 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
} }
if (ret != 0) if (ret != 0)
goto out; goto out;
new->nsec.family = family; new->nsec.family = family;
ret = sel_netnode_insert(new); new->nsec.sid = *sid;
if (ret != 0) sel_netnode_insert(new);
goto out;
*sid = new->nsec.sid;
out: out:
spin_unlock_bh(&sel_netnode_lock); spin_unlock_bh(&sel_netnode_lock);
...@@ -312,13 +299,18 @@ int sel_netnode_sid(void *addr, u16 family, u32 *sid) ...@@ -312,13 +299,18 @@ int sel_netnode_sid(void *addr, u16 family, u32 *sid)
*/ */
static void sel_netnode_flush(void) static void sel_netnode_flush(void)
{ {
u32 idx; unsigned int idx;
struct sel_netnode *node; struct sel_netnode *node, *node_tmp;
spin_lock_bh(&sel_netnode_lock); spin_lock_bh(&sel_netnode_lock);
for (idx = 0; idx < SEL_NETNODE_HASH_SIZE; idx++) for (idx = 0; idx < SEL_NETNODE_HASH_SIZE; idx++) {
list_for_each_entry(node, &sel_netnode_hash[idx], list) list_for_each_entry_safe(node, node_tmp,
sel_netnode_destroy(node); &sel_netnode_hash[idx].list, list) {
list_del_rcu(&node->list);
call_rcu(&node->rcu, sel_netnode_free);
}
sel_netnode_hash[idx].size = 0;
}
spin_unlock_bh(&sel_netnode_lock); spin_unlock_bh(&sel_netnode_lock);
} }
...@@ -340,8 +332,10 @@ static __init int sel_netnode_init(void) ...@@ -340,8 +332,10 @@ static __init int sel_netnode_init(void)
if (!selinux_enabled) if (!selinux_enabled)
return 0; return 0;
for (iter = 0; iter < SEL_NETNODE_HASH_SIZE; iter++) for (iter = 0; iter < SEL_NETNODE_HASH_SIZE; iter++) {
INIT_LIST_HEAD(&sel_netnode_hash[iter]); INIT_LIST_HEAD(&sel_netnode_hash[iter].list);
sel_netnode_hash[iter].size = 0;
}
ret = avc_add_callback(sel_netnode_avc_callback, AVC_CALLBACK_RESET, ret = avc_add_callback(sel_netnode_avc_callback, AVC_CALLBACK_RESET,
SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0); SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
......
security/selinux/netport.c
View file @ cfd299df
...@@ -114,8 +114,7 @@ static struct sel_netport *sel_netport_find(u8 protocol, u16 pnum) ...@@ -114,8 +114,7 @@ static struct sel_netport *sel_netport_find(u8 protocol, u16 pnum)
idx = sel_netport_hashfn(pnum); idx = sel_netport_hashfn(pnum);
list_for_each_entry_rcu(port, &sel_netport_hash[idx].list, list) list_for_each_entry_rcu(port, &sel_netport_hash[idx].list, list)
if (port->psec.port == pnum && if (port->psec.port == pnum && port->psec.protocol == protocol)
port->psec.protocol == protocol)
return port; return port;
return NULL; return NULL;
...@@ -126,11 +125,10 @@ static struct sel_netport *sel_netport_find(u8 protocol, u16 pnum) ...@@ -126,11 +125,10 @@ static struct sel_netport *sel_netport_find(u8 protocol, u16 pnum)
* @port: the new port record * @port: the new port record
* *
* Description: * Description:
* Add a new port record to the network address hash table. Returns zero on * Add a new port record to the network address hash table.
* success, negative values on failure.
* *
*/ */
static int sel_netport_insert(struct sel_netport *port) static void sel_netport_insert(struct sel_netport *port)
{ {
unsigned int idx; unsigned int idx;
...@@ -140,13 +138,13 @@ static int sel_netport_insert(struct sel_netport *port) ...@@ -140,13 +138,13 @@ static int sel_netport_insert(struct sel_netport *port)
list_add_rcu(&port->list, &sel_netport_hash[idx].list); list_add_rcu(&port->list, &sel_netport_hash[idx].list);
if (sel_netport_hash[idx].size == SEL_NETPORT_HASH_BKT_LIMIT) { if (sel_netport_hash[idx].size == SEL_NETPORT_HASH_BKT_LIMIT) {
struct sel_netport *tail; struct sel_netport *tail;
tail = list_entry(port->list.prev, struct sel_netport, list); tail = list_entry(
list_del_rcu(port->list.prev); rcu_dereference(sel_netport_hash[idx].list.prev),
struct sel_netport, list);
list_del_rcu(&tail->list);
call_rcu(&tail->rcu, sel_netport_free); call_rcu(&tail->rcu, sel_netport_free);
} else } else
sel_netport_hash[idx].size++; sel_netport_hash[idx].size++;
return 0;
} }
/** /**
...@@ -163,7 +161,7 @@ static int sel_netport_insert(struct sel_netport *port) ...@@ -163,7 +161,7 @@ static int sel_netport_insert(struct sel_netport *port)
*/ */
static int sel_netport_sid_slow(u8 protocol, u16 pnum, u32 *sid) static int sel_netport_sid_slow(u8 protocol, u16 pnum, u32 *sid)
{ {
int ret; int ret = -ENOMEM;
struct sel_netport *port; struct sel_netport *port;
struct sel_netport *new = NULL; struct sel_netport *new = NULL;
...@@ -171,23 +169,20 @@ static int sel_netport_sid_slow(u8 protocol, u16 pnum, u32 *sid) ...@@ -171,23 +169,20 @@ static int sel_netport_sid_slow(u8 protocol, u16 pnum, u32 *sid)
port = sel_netport_find(protocol, pnum); port = sel_netport_find(protocol, pnum);
if (port != NULL) { if (port != NULL) {
*sid = port->psec.sid; *sid = port->psec.sid;
ret = 0; spin_unlock_bh(&sel_netport_lock);
goto out; return 0;
} }
new = kzalloc(sizeof(*new), GFP_ATOMIC); new = kzalloc(sizeof(*new), GFP_ATOMIC);
if (new == NULL) { if (new == NULL)
ret = -ENOMEM;
goto out; goto out;
} ret = security_port_sid(protocol, pnum, sid);
ret = security_port_sid(protocol, pnum, &new->psec.sid);
if (ret != 0) if (ret != 0)
goto out; goto out;
new->psec.port = pnum; new->psec.port = pnum;
new->psec.protocol = protocol; new->psec.protocol = protocol;
ret = sel_netport_insert(new); new->psec.sid = *sid;
if (ret != 0) sel_netport_insert(new);
goto out;
*sid = new->psec.sid;
out: out:
spin_unlock_bh(&sel_netport_lock); spin_unlock_bh(&sel_netport_lock);
...@@ -239,11 +234,12 @@ int sel_netport_sid(u8 protocol, u16 pnum, u32 *sid) ...@@ -239,11 +234,12 @@ int sel_netport_sid(u8 protocol, u16 pnum, u32 *sid)
static void sel_netport_flush(void) static void sel_netport_flush(void)
{ {
unsigned int idx; unsigned int idx;
struct sel_netport *port; struct sel_netport *port, *port_tmp;
spin_lock_bh(&sel_netport_lock); spin_lock_bh(&sel_netport_lock);
for (idx = 0; idx < SEL_NETPORT_HASH_SIZE; idx++) { for (idx = 0; idx < SEL_NETPORT_HASH_SIZE; idx++) {
list_for_each_entry(port, &sel_netport_hash[idx].list, list) { list_for_each_entry_safe(port, port_tmp,
&sel_netport_hash[idx].list, list) {
list_del_rcu(&port->list); list_del_rcu(&port->list);
call_rcu(&port->rcu, sel_netport_free); call_rcu(&port->rcu, sel_netport_free);
} }
......
security/selinux/ss/conditional.h
View file @ cfd299df
...@@ -59,10 +59,10 @@ struct cond_node { ...@@ -59,10 +59,10 @@ struct cond_node {
struct cond_node *next; struct cond_node *next;
}; };
int cond_policydb_init(struct policydb* p); int cond_policydb_init(struct policydb *p);
void cond_policydb_destroy(struct policydb* p); void cond_policydb_destroy(struct policydb *p);
int cond_init_bool_indexes(struct policydb* p); int cond_init_bool_indexes(struct policydb *p);
int cond_destroy_bool(void *key, void *datum, void *p); int cond_destroy_bool(void *key, void *datum, void *p);
int cond_index_bool(void *key, void *datum, void *datap); int cond_index_bool(void *key, void *datum, void *datap);
......
security/selinux/ss/context.h
View file @ cfd299df
...@@ -84,9 +84,9 @@ static inline int mls_context_cmp(struct context *c1, struct context *c2) ...@@ -84,9 +84,9 @@ static inline int mls_context_cmp(struct context *c1, struct context *c2)
return 1; return 1;
return ((c1->range.level[0].sens == c2->range.level[0].sens) && return ((c1->range.level[0].sens == c2->range.level[0].sens) &&
ebitmap_cmp(&c1->range.level[0].cat,&c2->range.level[0].cat) && ebitmap_cmp(&c1->range.level[0].cat, &c2->range.level[0].cat) &&
(c1->range.level[1].sens == c2->range.level[1].sens) && (c1->range.level[1].sens == c2->range.level[1].sens) &&
ebitmap_cmp(&c1->range.level[1].cat,&c2->range.level[1].cat)); ebitmap_cmp(&c1->range.level[1].cat, &c2->range.level[1].cat));
} }
static inline void mls_context_destroy(struct context *c) static inline void mls_context_destroy(struct context *c)
......
security/selinux/ss/hashtab.h
View file @ cfd299df
...@@ -49,7 +49,7 @@ struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void * ...@@ -49,7 +49,7 @@ struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *
* Returns -ENOMEM on memory allocation error, * Returns -ENOMEM on memory allocation error,
* -EEXIST if there is already an entry with the same key, * -EEXIST if there is already an entry with the same key,
* -EINVAL for general errors or * -EINVAL for general errors or
* 0 otherwise. 0 otherwise.
*/ */
int hashtab_insert(struct hashtab *h, void *k, void *d); int hashtab_insert(struct hashtab *h, void *k, void *d);
......
security/selinux/ss/policydb.h
View file @ cfd299df
...@@ -221,7 +221,7 @@ struct policydb { ...@@ -221,7 +221,7 @@ struct policydb {
/* type enforcement conditional access vectors and transitions */ /* type enforcement conditional access vectors and transitions */
struct avtab te_cond_avtab; struct avtab te_cond_avtab;
/* linked list indexing te_cond_avtab by conditional */ /* linked list indexing te_cond_avtab by conditional */
struct cond_node* cond_list; struct cond_node *cond_list;
/* role allows */ /* role allows */
struct role_allow *role_allow; struct role_allow *role_allow;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7