diff options
-rw-r--r-- | net/openvswitch/datapath.c | 2 | ||||
-rw-r--r-- | net/openvswitch/flow.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 5b58d163a4dc..bca63c8487bb 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -672,7 +672,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) | |||
672 | goto err; | 672 | goto err; |
673 | skb_reserve(packet, NET_IP_ALIGN); | 673 | skb_reserve(packet, NET_IP_ALIGN); |
674 | 674 | ||
675 | memcpy(__skb_put(packet, len), nla_data(a[OVS_PACKET_ATTR_PACKET]), len); | 675 | nla_memcpy(__skb_put(packet, len), a[OVS_PACKET_ATTR_PACKET], len); |
676 | 676 | ||
677 | skb_reset_mac_header(packet); | 677 | skb_reset_mac_header(packet); |
678 | eth = eth_hdr(packet); | 678 | eth = eth_hdr(packet); |
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 332486839347..cf9328be75e9 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c | |||
@@ -211,7 +211,7 @@ struct sw_flow_actions *ovs_flow_actions_alloc(const struct nlattr *actions) | |||
211 | return ERR_PTR(-ENOMEM); | 211 | return ERR_PTR(-ENOMEM); |
212 | 212 | ||
213 | sfa->actions_len = actions_len; | 213 | sfa->actions_len = actions_len; |
214 | memcpy(sfa->actions, nla_data(actions), actions_len); | 214 | nla_memcpy(sfa->actions, actions, actions_len); |
215 | return sfa; | 215 | return sfa; |
216 | } | 216 | } |
217 | 217 | ||