OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update patch set 4.19.114

This commit is contained in:
Miguel Bernal Marin 2020-04-02 18:04:04 -06:00
parent 8b9ae8d79d
commit 288e2ea9fd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0094-LSM-Use-multiple-secids-in-security-module-interface.patch
View File

@ -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);

8
0095-LSM-Use-multiple-secids-in-LSM-interfaces.patch
View File

@ -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);