From 288e2ea9fd04ad1a9339c8b0cedeccc15f8826d7 Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Thu, 2 Apr 2020 18:04:04 -0600 Subject: [PATCH] update patch set 4.19.114 --- ...Use-multiple-secids-in-security-module-interface.patch | 8 ++++---- 0095-LSM-Use-multiple-secids-in-LSM-interfaces.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/0094-LSM-Use-multiple-secids-in-security-module-interface.patch b/0094-LSM-Use-multiple-secids-in-security-module-interface.patch index 69ffcec6..25742051 100644 --- a/0094-LSM-Use-multiple-secids-in-security-module-interface.patch +++ b/0094-LSM-Use-multiple-secids-in-security-module-interface.patch @@ -490,10 +490,10 @@ index 4a397cde1a48..782ee194fdbd 100644 audit_info->sessionid = audit_get_sessionid(current); } diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c -index ce1b262ce964..777cda016a30 100644 +index b30c074160e3..12a268b75985 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c -@@ -1082,7 +1082,8 @@ static int xfrm_policy_match(const struct xfrm_policy *pol, +@@ -1084,7 +1084,8 @@ static int xfrm_policy_match(const struct xfrm_policy *pol, match = xfrm_selector_match(sel, fl, family); if (match) @@ -503,7 +503,7 @@ index ce1b262ce964..777cda016a30 100644 dir); return ret; -@@ -1201,7 +1202,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, +@@ -1203,7 +1204,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, goto out; } err = security_xfrm_policy_lookup(pol->security, @@ -512,7 +512,7 @@ index ce1b262ce964..777cda016a30 100644 dir); if (!err) { if (!xfrm_pol_hold_rcu(pol)) -@@ -2301,7 +2302,7 @@ int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, +@@ -2303,7 +2304,7 @@ int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, afinfo->decode_session(skb, fl, reverse); diff --git a/0095-LSM-Use-multiple-secids-in-LSM-interfaces.patch b/0095-LSM-Use-multiple-secids-in-LSM-interfaces.patch index 3f4f617e..e3d3cba1 100644 --- a/0095-LSM-Use-multiple-secids-in-LSM-interfaces.patch +++ b/0095-LSM-Use-multiple-secids-in-LSM-interfaces.patch @@ -962,10 +962,10 @@ index 2318e2e2748f..991fe3a695a3 100644 #else static inline void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb) diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c -index 777cda016a30..7de46bf96863 100644 +index 12a268b75985..0a962b6716d8 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c -@@ -1083,7 +1083,7 @@ static int xfrm_policy_match(const struct xfrm_policy *pol, +@@ -1085,7 +1085,7 @@ static int xfrm_policy_match(const struct xfrm_policy *pol, match = xfrm_selector_match(sel, fl, family); if (match) ret = security_xfrm_policy_lookup(pol->security, @@ -974,7 +974,7 @@ index 777cda016a30..7de46bf96863 100644 dir); return ret; -@@ -1202,7 +1202,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, +@@ -1204,7 +1204,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, goto out; } err = security_xfrm_policy_lookup(pol->security, @@ -983,7 +983,7 @@ index 777cda016a30..7de46bf96863 100644 dir); if (!err) { if (!xfrm_pol_hold_rcu(pol)) -@@ -2302,7 +2302,7 @@ int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, +@@ -2304,7 +2304,7 @@ int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, afinfo->decode_session(skb, fl, reverse);