--- v34
+++ v29
@@ -69,7 +69,7 @@
{
return -ENOSYS;
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
-index 62d5f99760aa..bb9c900da6b0 100644
+index 099259fc826a..9bd72ec01785 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -106,15 +106,17 @@ int cipso_v4_rbm_strictvalid = 1;
@@ -121,7 +121,7 @@
return 0;
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
-index 54c083003947..14ebe0424811 100644
+index beb0e573266d..158bab993e32 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -196,7 +196,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
@@ -152,7 +152,7 @@
/**
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
-index 46706889a6f7..3aab71ba3841 100644
+index 596a75814fbf..60e36324568f 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -66,7 +66,7 @@ struct netlbl_unlhsh_tbl {
@@ -420,12 +420,12 @@
int netlbl_unlhsh_remove(struct net *net,
const char *dev_name,
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index bf93dc6ad160..81d71d664600 100644
+index 06974ad48b9d..c3e5fcedae0b 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -7003,7 +7003,7 @@ static int selinux_uring_sqpoll(void)
+@@ -7118,7 +7118,7 @@ static int selinux_perf_event_write(struct perf_event *event)
}
- #endif /* CONFIG_IO_URING */
+ #endif
-static struct lsm_id selinux_lsmid __lsm_ro_after_init = {
+struct lsm_id selinux_lsmid __lsm_ro_after_init = {
@@ -433,7 +433,7 @@
.slot = LSMBLOB_NEEDED
};
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
-index ace4bd13e808..f60cd964da62 100644
+index ac0ece01305a..9f856f2cd277 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -73,6 +73,7 @@
@@ -445,10 +445,10 @@
/*
* type_datum properties
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
-index 800ab4b4239e..0b8f99703462 100644
+index 6a94b31b5472..d8d7603ab14e 100644
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c
-@@ -109,7 +109,7 @@ static struct netlbl_lsm_secattr *selinux_netlbl_sock_getattr(
+@@ -108,7 +108,7 @@ static struct netlbl_lsm_secattr *selinux_netlbl_sock_getattr(
return NULL;
if ((secattr->flags & NETLBL_SECATTR_SECID) &&
@@ -458,10 +458,10 @@
return NULL;
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
-index 6901dc07680d..fac287237495 100644
+index e5f1b2757a83..404a573dd339 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
-@@ -3897,7 +3897,7 @@ int security_netlbl_secattr_to_sid(struct selinux_state *state,
+@@ -3901,7 +3901,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);
-@@ -3975,7 +3975,7 @@ int security_netlbl_sid_to_secattr(struct selinux_state *state,
+@@ -3979,7 +3979,7 @@ int security_netlbl_sid_to_secattr(struct selinux_state *state,
if (secattr->domain == NULL)
goto out;
@@ -480,7 +480,7 @@
mls_export_netlbl_lvl(policydb, ctx, secattr);
rc = mls_export_netlbl_cat(policydb, ctx, secattr);
diff --git a/security/smack/smack.h b/security/smack/smack.h
-index ef9d0b7b1954..ac79313ea95d 100644
+index 66b813e15196..44fd5bc8ba71 100644
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -303,6 +303,7 @@ int smack_populate_secattr(struct smack_known *skp);
@@ -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 552c4d4d8fac..2190c03ae3d0 100644
+index 654b8a66df3c..711fb49b4d5f 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
-@@ -3728,11 +3728,12 @@ static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap,
+@@ -3720,11 +3720,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) {
/*
-@@ -4751,7 +4752,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = {
+@@ -4701,7 +4702,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = {
.lbs_superblock = sizeof(struct superblock_smack),
};
@@ -535,10 +535,10 @@
.slot = LSMBLOB_NEEDED
};
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
-index 658eab05599e..13c2fa728054 100644
+index 3a75d2a8f517..9cda52f2ec31 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
-@@ -1143,6 +1143,7 @@ static void smk_net4addr_insert(struct smk_net4addr *new)
+@@ -1142,6 +1142,7 @@ static void smk_net4addr_insert(struct smk_net4addr *new)
static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
@@ -546,7 +546,7 @@
struct smk_net4addr *snp;
struct sockaddr_in newname;
char *smack;
-@@ -1274,10 +1275,13 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,
+@@ -1273,10 +1274,13 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,
* this host so that incoming packets get labeled.
* but only if we didn't get the special CIPSO option
*/
@@ -564,5 +564,5 @@
if (rc == 0)
rc = count;
--
-2.35.1
+2.31.1