Messages in this thread | | | Subject | Re: [PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always | From | Sergei Shtylyov <> | Date | Wed, 24 May 2017 12:41:15 +0300 |
| |
Hello!
On 5/23/2017 7:05 PM, Jason A. Donenfeld wrote:
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Jason Wang <jasowang@redhat.com> > --- > drivers/net/virtio_net.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 9320d96a1632..13fbe4b349c2 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1150,7 +1150,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) > struct virtio_net_hdr_mrg_rxbuf *hdr; > const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; > struct virtnet_info *vi = sq->vq->vdev->priv; > - unsigned num_sg; > + int num_sg; > unsigned hdr_len = vi->hdr_len; > bool can_push; > > @@ -1177,11 +1177,16 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) > if (can_push) { > __skb_push(skb, hdr_len); > num_sg = skb_to_sgvec(skb, sq->sg, 0, skb->len); > + if (unlikely(num_sg < 0))
Please indent with tabs, like above and below.
> + return num_sg; > /* Pull header back to avoid skew in tx bytes calculations. */ > __skb_pull(skb, hdr_len); [...]
MBR, Sergei
| |