--- v25
+++ v24
@@ -420,10 +420,10 @@
int netlbl_unlhsh_remove(struct net *net,
const char *dev_name,
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 3141ed8544de..5ed2164ea0e4 100644
+index 7bc9a043a30a..60e35d31cc4c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -7045,7 +7045,7 @@ static int selinux_perf_event_write(struct perf_event *event)
+@@ -6952,7 +6952,7 @@ static int selinux_perf_event_write(struct perf_event *event)
}
#endif
@@ -433,7 +433,7 @@
.slot = LSMBLOB_NEEDED
};
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
-index 6fe25300b89d..76c251c49398 100644
+index 3cc8bab31ea8..6a40b47307ca 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -73,6 +73,7 @@
@@ -458,10 +458,10 @@
return NULL;
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
-index 3438d0130378..c183492dd48f 100644
+index 597b79703584..a18339bc883a 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
-@@ -3785,7 +3785,7 @@ int security_netlbl_secattr_to_sid(struct selinux_state *state,
+@@ -3787,7 +3787,7 @@ int security_netlbl_secattr_to_sid(struct selinux_state *state,
if (secattr->flags & NETLBL_SECATTR_CACHE)
*sid = *(u32 *)secattr->cache->data;
else if (secattr->flags & NETLBL_SECATTR_SECID)
@@ -470,7 +470,7 @@
else if (secattr->flags & NETLBL_SECATTR_MLS_LVL) {
rc = -EIDRM;
ctx = sidtab_search(sidtab, SECINITSID_NETMSG);
-@@ -3861,7 +3861,7 @@ int security_netlbl_sid_to_secattr(struct selinux_state *state,
+@@ -3863,7 +3863,7 @@ int security_netlbl_sid_to_secattr(struct selinux_state *state,
if (secattr->domain == NULL)
goto out;
@@ -505,10 +505,10 @@
skp->smk_netlabel.cache = netlbl_secattr_cache_alloc(GFP_ATOMIC);
if (skp->smk_netlabel.cache != NULL) {
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index 576f412b8616..1c14983f87c7 100644
+index ef04029dcdf1..03a1c40174d7 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
-@@ -3723,11 +3723,12 @@ static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap,
+@@ -3721,11 +3721,12 @@ static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap,
if ((sap->flags & NETLBL_SECATTR_CACHE) != 0)
return (struct smack_known *)sap->cache->data;
@@ -525,7 +525,7 @@
if ((sap->flags & NETLBL_SECATTR_MLS_LVL) != 0) {
/*
-@@ -4703,7 +4704,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = {
+@@ -4699,7 +4700,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = {
.lbs_sock = sizeof(struct socket_smack),
};
@@ -535,7 +535,7 @@
.slot = LSMBLOB_NEEDED
};
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
-index 22ded2c26089..e592e10397af 100644
+index 5d44b7d258ef..ad946ccf5023 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -1140,6 +1140,7 @@ static void smk_net4addr_insert(struct smk_net4addr *new)
@@ -564,5 +564,5 @@
if (rc == 0)
rc = count;
--
-2.29.2
+2.25.4