Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1649387
| From | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always |
| Date | 2017-05-24 11:50 +0200 |
| Message-ID | <tKB5w-AM-21@gated-at.bofh.it> (permalink) |
| References | <tKkxI-5uz-13@gated-at.bofh.it> <tKkxI-5uz-31@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next v9 0/5] skb_to_sgvec hardening "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-05-23 18:10 +0200
[PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-05-23 18:10 +0200
Re: [PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-05-24 11:50 +0200
Re: [PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-05-24 13:40 +0200
Re: [PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-05-24 18:50 +0200
Re: [PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-05-24 22:40 +0200
Re: [PATCH net-next v9 5/5] virtio_net: check return value of skb_to_sgvec always Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-05-24 22:50 +0200
[PATCH net-next v9 2/5] ipsec: check return value of skb_to_sgvec always "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-05-23 18:10 +0200
Re: [PATCH net-next v9 0/5] skb_to_sgvec hardening "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-05-23 18:30 +0200
csiph-web