diff options
| author | Jason Wang <jasowang@redhat.com> | 2012-05-02 11:42:06 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:30:34 -0700 |
| commit | 2b3c7134014a200279e7ed31716e528cd009dfb0 (patch) | |
| tree | 30a9e2d5971f14b0d99c335c116a70850f441c9c /drivers/net | |
| parent | 61f26eb401b04a9312c422a5dcc7436246f37b58 (diff) | |
| download | linux-3.10-2b3c7134014a200279e7ed31716e528cd009dfb0.tar.gz linux-3.10-2b3c7134014a200279e7ed31716e528cd009dfb0.tar.bz2 linux-3.10-2b3c7134014a200279e7ed31716e528cd009dfb0.zip | |
macvtap: zerocopy: set SKBTX_DEV_ZEROCOPY only when skb is built successfully
commit 01d6657b388438def19c8baaea28e742b6ed32ec upstream.
Current the SKBTX_DEV_ZEROCOPY is set unconditionally after
zerocopy_sg_from_iovec(), this would lead NULL pointer when macvtap
fails to build zerocopy skb because destructor_arg was not
initialized. Solve this by set this flag after the skb were built
successfully.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/macvtap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 7cd750f4c6a..b99c418d6b2 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -716,10 +716,9 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m, if (!skb) goto err; - if (zerocopy) { + if (zerocopy) err = zerocopy_sg_from_iovec(skb, iv, vnet_hdr_len, count); - skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY; - } else + else err = skb_copy_datagram_from_iovec(skb, 0, iv, vnet_hdr_len, len); if (err) @@ -738,8 +737,10 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m, rcu_read_lock_bh(); vlan = rcu_dereference_bh(q->vlan); /* copy skb_ubuf_info for callback when skb has no error */ - if (zerocopy) + if (zerocopy) { skb_shinfo(skb)->destructor_arg = m->msg_control; + skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY; + } if (vlan) macvlan_start_xmit(skb, vlan->dev); else |