[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [PATCH v3] core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors
- To: Thomas Graf <tgraf@xxxxxxxxxx>, Jesse Gross <jesse@xxxxxxxxxx>, <pshelar@xxxxxxxxxx>, <dev@xxxxxxxxxxxxxxx>
- From: Zoltan Kiss <zoltan.kiss@xxxxxxxxxx>
- Date: Fri, 21 Mar 2014 10:35:13 +0000
- Cc: netfilter@xxxxxxxxxxxxxxx, Miklos Szeredi <mszeredi@xxxxxxx>, kvm@xxxxxxxxxxxxxxx, "Michael S. Tsirkin" <mst@xxxxxxxxxx>, Jason Wang <jasowang@xxxxxxxxxx>, Eric Dumazet <edumazet@xxxxxxxxxx>, Jan Beulich <JBeulich@xxxxxxxx>, Tom Herbert <therbert@xxxxxxxxxx>, Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>, Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx, Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>, Jiri Pirko <jiri@xxxxxxxxxxx>, Paul Durrant <Paul.Durrant@xxxxxxxxxx>, netdev@xxxxxxxxxxxxxxx, Florian Westphal <fw@xxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, Daniel Borkmann <dborkman@xxxxxxxxxx>, Simon Horman <horms@xxxxxxxxxxxx>, netfilter-devel@xxxxxxxxxxxxxxx, Joe Perches <joe@xxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxxxxx>
- Delivery-date: Fri, 21 Mar 2014 10:35:31 +0000
- List-id: Xen developer discussion <xen-devel.lists.xen.org>
On 20/03/14 22:22, Thomas Graf wrote:
On 03/20/2014 05:02 PM, Zoltan Kiss wrote:
--- 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,7 @@ 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:
+ skb_tx_error(skb);
Really sorry to bug you again. We'll get this right ;-)
Patch looks great except for this call to skb_tx_error() which is now
done in the error *and* success path. Make the call conditional on
if (err) and we're good.
Ah, sorry, I'm really sloppy with this patch. I've sent a fixed one.
Zoli
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
