diff options
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 14 | 
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 521bcb5b9717..92ac3f27b973 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -391,7 +391,7 @@ int security_dentry_init_security(struct dentry *dentry, int mode,  				  const char **xattr_name,  				  struct lsm_context *lsmcxt);  int security_dentry_create_files_as(struct dentry *dentry, int mode, -					struct qstr *name, +					const struct qstr *name,  					const struct cred *old,  					struct cred *new);  int security_path_notify(const struct path *path, u64 mask, @@ -489,7 +489,7 @@ int security_file_receive(struct file *file);  int security_file_open(struct file *file);  int security_file_post_open(struct file *file, int mask);  int security_file_truncate(struct file *file); -int security_task_alloc(struct task_struct *task, unsigned long clone_flags); +int security_task_alloc(struct task_struct *task, u64 clone_flags);  void security_task_free(struct task_struct *task);  int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);  void security_cred_free(struct cred *cred); @@ -567,7 +567,8 @@ int security_getprocattr(struct task_struct *p, int lsmid, const char *name,  int security_setprocattr(int lsmid, const char *name, void *value, size_t size);  int security_ismaclabel(const char *name);  int security_secid_to_secctx(u32 secid, struct lsm_context *cp); -int security_lsmprop_to_secctx(struct lsm_prop *prop, struct lsm_context *cp); +int security_lsmprop_to_secctx(struct lsm_prop *prop, struct lsm_context *cp, +			       int lsmid);  int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid);  void security_release_secctx(struct lsm_context *cp);  void security_inode_invalidate_secctx(struct inode *inode); @@ -871,7 +872,7 @@ static inline int security_dentry_init_security(struct dentry *dentry,  }  static inline int security_dentry_create_files_as(struct dentry *dentry, -						  int mode, struct qstr *name, +						  int mode, const struct qstr *name,  						  const struct cred *old,  						  struct cred *new)  { @@ -1215,7 +1216,7 @@ static inline int security_file_truncate(struct file *file)  }  static inline int security_task_alloc(struct task_struct *task, -				      unsigned long clone_flags) +				      u64 clone_flags)  {  	return 0;  } @@ -1551,7 +1552,8 @@ static inline int security_secid_to_secctx(u32 secid, struct lsm_context *cp)  }  static inline int security_lsmprop_to_secctx(struct lsm_prop *prop, -					     struct lsm_context *cp) +					     struct lsm_context *cp, +					     int lsmid)  {  	return -EOPNOTSUPP;  }  | 
