diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
| commit | 64c27237a07129758e33f5f824ba5c33b7f57417 (patch) | |
| tree | 4c0c0a9b6d282d600f2226e1b3510096b9d789dd /net/openvswitch/datapath.c | |
| parent | 77a9939426f7a3f35f460afc9b11f1fe45955409 (diff) | |
| parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 (diff) | |
| download | linux-stable-64c27237a07129758e33f5f824ba5c33b7f57417.tar.gz linux-stable-64c27237a07129758e33f5f824ba5c33b7f57417.tar.bz2 linux-stable-64c27237a07129758e33f5f824ba5c33b7f57417.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/marvell/mvneta.c
The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/datapath.c')
| -rw-r--r-- | net/openvswitch/datapath.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 48bbcd94631e..a3276e3c4feb 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -464,7 +464,9 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, } nla->nla_len = nla_attr_size(skb->len); - skb_zerocopy(user_skb, skb, skb->len, hlen); + err = skb_zerocopy(user_skb, skb, skb->len, hlen); + if (err) + goto out; /* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */ if (!(dp->user_features & OVS_DP_F_UNALIGNED)) { @@ -478,6 +480,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, upcall_info->portid); out: + if (err) + skb_tx_error(skb); kfree_skb(nskb); return err; } |