Commit 11c7b03d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull security subsystem updates from James Morris:
 "Nothing major for this kernel, just maintenance updates"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (21 commits)
  apparmor: add the ability to report a sha1 hash of loaded policy
  apparmor: export set of capabilities supported by the apparmor module
  apparmor: add the profile introspection file to interface
  apparmor: add an optional profile attachment string for profiles
  apparmor: add interface files for profiles and namespaces
  apparmor: allow setting any profile into the unconfined state
  apparmor: make free_profile available outside of policy.c
  apparmor: rework namespace free path
  apparmor: update how unconfined is handled
  apparmor: change how profile replacement update is done
  apparmor: convert profile lists to RCU based locking
  apparmor: provide base for multiple profiles to be replaced at once
  apparmor: add a features/policy dir to interface
  apparmor: enable users to query whether apparmor is enabled
  apparmor: remove minimum size check for vmalloc()
  Smack: parse multiple rules per write to load2, up to PAGE_SIZE-1 bytes
  Smack: network label match fix
  security: smack: add a hash table to quicken smk_find_entry()
  security: smack: fix memleak in smk_write_rules_list()
  xattr: Constify ->name member of "struct xattr".
  ...
parents 6be48f29 73203361

fs/ocfs2/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ enum ocfs2_xattr_type { 


struct ocfs2_security_xattr_info {

	int enable;

	char *name;

	const char *name;

	void *value;

	size_t value_len;

};

include/linux/security.h

+4 −4
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ struct security_operations { 
	int (*inode_alloc_security) (struct inode *inode);

	void (*inode_free_security) (struct inode *inode);

	int (*inode_init_security) (struct inode *inode, struct inode *dir,

				    const struct qstr *qstr, char **name,

				    const struct qstr *qstr, const char **name,

				    void **value, size_t *len);

	int (*inode_create) (struct inode *dir,

			     struct dentry *dentry, umode_t mode);
@@ -1770,7 +1770,7 @@ int security_inode_init_security(struct inode *inode, struct inode *dir, 
				 const struct qstr *qstr,

				 initxattrs initxattrs, void *fs_data);

int security_old_inode_init_security(struct inode *inode, struct inode *dir,

				     const struct qstr *qstr, char **name,

				     const struct qstr *qstr, const char **name,

				     void **value, size_t *len);

int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);

int security_inode_link(struct dentry *old_dentry, struct inode *dir,
@@ -2094,8 +2094,8 @@ static inline int security_inode_init_security(struct inode *inode, 
static inline int security_old_inode_init_security(struct inode *inode,

						   struct inode *dir,

						   const struct qstr *qstr,

						   char **name, void **value,

						   size_t *len)

						   const char **name,

						   void **value, size_t *len)

{

	return -EOPNOTSUPP;

}

include/linux/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct xattr_handler { 
};



struct xattr {

	char *name;

	const char *name;

	void *value;

	size_t value_len;

};

include/uapi/linux/reiserfs_xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct reiserfs_xattr_header { 
};



struct reiserfs_security_handle {

	char *name;

	const char *name;

	void *value;

	size_t length;

};

security/apparmor/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -29,3 +29,15 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE 
	  boot.



	  If you are unsure how to answer this question, answer 1.



config SECURITY_APPARMOR_HASH

	bool "SHA1 hash of loaded profiles"

	depends on SECURITY_APPARMOR

	depends on CRYPTO

	select CRYPTO_SHA1

	default y



	help

	  This option selects whether sha1 hashing is done against loaded

          profiles and exported for inspection to user space via the apparmor

          filesystem.

CRA Git | Maintained and supported by SUSTech CRA and CCSE