cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

openvswitch: update to version 2.11.6 (security fix)

Browse Source 
Fixes CVEs:
- CVE-2020-35498
- In DPDK: CVE-2015-8011 and CVE-2020-27827
- In LLDP: CVE-2019-14818, CVE-2020-10722, CVE-2020-10723 and CVE-2020-10724

Removed patches:
- 0001-compat-Include-confirm_neigh-parameter-if-needed.patch because they
are included in this release as it was backported
- 0010-acinclude-Fix-build-with-kernels-with-prandom-moved-.patch
included in this release as it was backported

Other patches were refreshed.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
Josef Schlehofer
2021-02-23 07:28:13 +01:00
committed by Yousong Zhou
parent 3be5d565cf
commit 8e1b62d4bb
11 changed files with 15 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/openvswitch/patches/0002-compat-Fix-ipv6_dst_lookup-build-error.patch
+7 -11
View File
@@ -27,11 +27,9 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
datapath/linux/compat/vxlan.c | 14 ++++++++------
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 84098f2a5..f124caefb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -508,7 +508,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
@@ -510,7 +510,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
OVS_GREP_IFELSE([$KSRC/include/net/addrconf.h], [ipv6_dst_lookup.*net],
[OVS_DEFINE([HAVE_IPV6_DST_LOOKUP_NET])])
@@ -42,11 +40,9 @@ index 84098f2a5..f124caefb 100644
OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [ERR_CAST])
OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [IS_ERR_OR_NULL])
diff --git a/datapath/linux/compat/geneve.c b/datapath/linux/compat/geneve.c
index c044b1489..4bdab6836 100644
--- a/datapath/linux/compat/geneve.c
+++ b/datapath/linux/compat/geneve.c
@@ -962,14 +962,17 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
@@ -962,15 +962,18 @@ static struct dst_entry *geneve_get_v6_d
return dst;
}
@@ -64,15 +60,14 @@ index c044b1489..4bdab6836 100644
if (ipv6_stub->ipv6_dst_lookup(gs6->sock->sk, &dst, fl6)) {
#else
if (ip6_dst_lookup(gs6->sock->sk, &dst, fl6)) {
-#endif
#endif
-#endif
netdev_dbg(dev, "no route to %pI6\n", &fl6->daddr);
return ERR_PTR(-ENETUNREACH);
diff --git a/datapath/linux/compat/vxlan.c b/datapath/linux/compat/vxlan.c
index 23118e8b6..ff10ae6f4 100644
}
--- a/datapath/linux/compat/vxlan.c
+++ b/datapath/linux/compat/vxlan.c
@@ -990,17 +990,19 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
@@ -990,18 +990,20 @@ static struct dst_entry *vxlan6_get_rout
fl6.fl6_dport = dport;
fl6.fl6_sport = sport;
@@ -94,7 +89,8 @@ index 23118e8b6..ff10ae6f4 100644
&ndst, &fl6);
#else
err = ip6_dst_lookup(vxlan->vn6_sock->sock->sk, &ndst, &fl6);
-#endif
#endif
-#endif
if (err < 0)
return ERR_PTR(err);