From cf81bdd8efb2b48e31500cd572d2145f2fc86173 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 21 Mar 2022 13:41:37 +0100 Subject: [PATCH] sys-kernel/coreos-sources: delete patch for Reverting xfrm state The patch z0005-Revert-xfrm-state-... is already included in the upstream v5.15.30. Delete the patch to fix build failures. --- .../coreos-sources-5.15.30.ebuild | 3 +- ...-Mask-MSI-X-vectors-only-on-success.patch} | 0 ...e-and-policy-should-fail-if-XFRMA_IF.patch | 67 ------------------- 3 files changed, 1 insertion(+), 69 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/{z0006-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch => z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-xfrm-state-and-policy-should-fail-if-XFRMA_IF.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.30.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.30.ebuild index fbdfca27ba..96ac1b4ca4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.30.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.30.ebuild @@ -36,6 +36,5 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ ${PATCH_DIR}/z0003-PCI-hv-Make-the-code-arch-neutral-by-adding-arch-spe.patch \ ${PATCH_DIR}/z0004-PCI-hv-Add-arm64-Hyper-V-vPCI-support.patch \ - ${PATCH_DIR}/z0005-Revert-xfrm-state-and-policy-should-fail-if-XFRMA_IF.patch \ - ${PATCH_DIR}/z0006-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch \ + ${PATCH_DIR}/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-xfrm-state-and-policy-should-fail-if-XFRMA_IF.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-xfrm-state-and-policy-should-fail-if-XFRMA_IF.patch deleted file mode 100644 index 861eb150cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-xfrm-state-and-policy-should-fail-if-XFRMA_IF.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 509a0cc7c909899d76b2d7b0afd0124966358515 Mon Sep 17 00:00:00 2001 -From: Kai Lueke -Date: Mon, 28 Feb 2022 19:40:26 +0100 -Subject: [PATCH 2/2] Revert "xfrm: state and policy should fail if XFRMA_IF_ID - 0" - -This reverts commit 68ac0f3810e76a853b5f7b90601a05c3048b8b54 because it -breaks userspace (e.g., Cilium is affected because it used id 0 for the -dummy state https://github.com/cilium/cilium/pull/18789). - -Signed-off-by: Kai Lueke ---- - net/xfrm/xfrm_user.c | 21 +++------------------ - 1 file changed, 3 insertions(+), 18 deletions(-) - -diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c -index 8cd6c8129004..be89a8ac54a4 100644 ---- a/net/xfrm/xfrm_user.c -+++ b/net/xfrm/xfrm_user.c -@@ -630,13 +630,8 @@ static struct xfrm_state *xfrm_state_construct(struct net *net, - - xfrm_smark_init(attrs, &x->props.smark); - -- if (attrs[XFRMA_IF_ID]) { -+ if (attrs[XFRMA_IF_ID]) - x->if_id = nla_get_u32(attrs[XFRMA_IF_ID]); -- if (!x->if_id) { -- err = -EINVAL; -- goto error; -- } -- } - - err = __xfrm_init_state(x, false, attrs[XFRMA_OFFLOAD_DEV]); - if (err) -@@ -1432,13 +1427,8 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, - - mark = xfrm_mark_get(attrs, &m); - -- if (attrs[XFRMA_IF_ID]) { -+ if (attrs[XFRMA_IF_ID]) - if_id = nla_get_u32(attrs[XFRMA_IF_ID]); -- if (!if_id) { -- err = -EINVAL; -- goto out_noput; -- } -- } - - if (p->info.seq) { - x = xfrm_find_acq_byseq(net, mark, p->info.seq); -@@ -1751,13 +1741,8 @@ static struct xfrm_policy *xfrm_policy_construct(struct net *net, struct xfrm_us - - xfrm_mark_get(attrs, &xp->mark); - -- if (attrs[XFRMA_IF_ID]) { -+ if (attrs[XFRMA_IF_ID]) - xp->if_id = nla_get_u32(attrs[XFRMA_IF_ID]); -- if (!xp->if_id) { -- err = -EINVAL; -- goto error; -- } -- } - - return xp; - error: --- -2.35.1 -