--- v26
+++ v24
@@ -18,11 +18,11 @@
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/include/linux/security.h b/include/linux/security.h
-index 60f4515b9181..64f898e5e854 100644
+index 9fc245c1f739..e8d73b0220e4 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -454,7 +454,7 @@ int security_inode_getsecurity(struct user_namespace *mnt_userns,
- void **buffer, bool alloc);
+@@ -441,7 +441,7 @@ int security_inode_killpriv(struct dentry *dentry);
+ int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc);
int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags);
int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size);
-void security_inode_getsecid(struct inode *inode, u32 *secid);
@@ -30,7 +30,7 @@
int security_inode_copy_up(struct dentry *src, struct cred **new);
int security_inode_copy_up_xattr(const char *name);
int security_kernfs_init_security(struct kernfs_node *kn_dir,
-@@ -1005,9 +1005,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer,
+@@ -968,9 +968,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer,
return 0;
}
@@ -44,10 +44,10 @@
static inline int security_inode_copy_up(struct dentry *src, struct cred **new)
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index dd902b68433e..6684927f12fc 100644
+index 62e2e6de5486..7883b8ac8ea4 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
-@@ -1962,13 +1962,17 @@ static void audit_copy_inode(struct audit_names *name,
+@@ -1966,13 +1966,17 @@ static void audit_copy_inode(struct audit_names *name,
const struct dentry *dentry,
struct inode *inode, unsigned int flags)
{
@@ -67,10 +67,10 @@
name->fcap_ver = -1;
return;
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
-index a05841e1012b..5ee7629fd782 100644
+index 265184921eef..ab66266fe932 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
-@@ -606,7 +606,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule,
+@@ -575,7 +575,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,
return false;
for (i = 0; i < MAX_LSM_RULES; i++) {
int rc = 0;
@@ -78,7 +78,7 @@
struct lsmblob lsmdata;
if (!ima_lsm_isset(rule, i)) {
-@@ -619,8 +618,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule,
+@@ -588,8 +587,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,
case LSM_OBJ_USER:
case LSM_OBJ_ROLE:
case LSM_OBJ_TYPE:
@@ -87,12 +87,12 @@
+ security_inode_getsecid(inode, &lsmdata);
rc = ima_filter_rule_match(&lsmdata, rule->lsm[i].type,
Audit_equal,
- rule->lsm[i].rule);
+ rule->lsm[i].rules);
diff --git a/security/security.c b/security/security.c
-index f3b985f76dab..54f4a4ead69f 100644
+index 3f0a3aedad19..9241245a9d4b 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -1546,9 +1546,16 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer
+@@ -1489,9 +1489,16 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer
}
EXPORT_SYMBOL(security_inode_listsecurity);
@@ -112,5 +112,5 @@
int security_inode_copy_up(struct dentry *src, struct cred **new)
--
-2.29.2
+2.25.4