[SRU][Yakkety][PATCH 1/1] openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD

Joseph Salisbury joseph.salisbury at canonical.com
Tue May 30 19:14:33 UTC 2017


From: Kris Murphy <kriskend at linux.vnet.ibm.com>

BugLink: http://bugs.launchpad.net/bugs/1676679

Added a case for OVS_TUNNEL_KEY_ATTR_PAD to the switch statement
in ip_tun_from_nlattr in order to prevent the default case
returning an error.

Fixes: b46f6ded906e ("libnl: nla_put_be64(): align on a 64-bit area")
Signed-off-by: Kris Murphy <kriskend at linux.vnet.ibm.com>
Acked-by: Joe Stringer <joe at ovn.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 8f3dbfd79ed9ef9770305a7cc4e13dfd31ad2cd0)
Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 net/openvswitch/flow_netlink.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index c78a6a1..eef6357 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -649,6 +649,8 @@ static int ip_tun_from_nlattr(const struct nlattr *attr,
 			tun_flags |= TUNNEL_VXLAN_OPT;
 			opts_type = type;
 			break;
+		case OVS_TUNNEL_KEY_ATTR_PAD:
+			break;
 		default:
 			OVS_NLERR(log, "Unknown IP tunnel attribute %d",
 				  type);
-- 
2.7.4





More information about the kernel-team mailing list