lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 07 Dec 2013 11:06:23 +1030 From: Rusty Russell <rusty@...tcorp.com.au> To: Michael Dalton <mwdalton@...gle.com>, "David S. Miller" <davem@...emloft.net> Cc: netdev@...r.kernel.org, Eric Dumazet <edumazet@...gle.com>, "Michael S. Tsirkin" <mst@...hat.com>, Jason Wang <jasowang@...hat.com>, Andrey Vagin <avagin@...nvz.org>, virtualization@...ts.linux-foundation.org, Michael Dalton <mwdalton@...gle.com> Subject: Re: [PATCH v2] virtio-net: free bufs correctly on invalid packet length Michael Dalton <mwdalton@...gle.com> writes: > When a packet with invalid length arrives, ensure that the packet > is freed correctly if mergeable packet buffers and big packets > (GUEST_TSO4) are both enabled. > > Signed-off-by: Michael Dalton <mwdalton@...gle.com> Acked-by: Rusty Russell <rusty@...tcorp.com.au> Thanks! > --- > drivers/net/virtio_net.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 916241d..6a4665c 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -426,10 +426,10 @@ static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len) > if (unlikely(len < sizeof(struct virtio_net_hdr) + ETH_HLEN)) { > pr_debug("%s: short packet %i\n", dev->name, len); > dev->stats.rx_length_errors++; > - if (vi->big_packets) > - give_pages(rq, buf); > - else if (vi->mergeable_rx_bufs) > + if (vi->mergeable_rx_bufs) > put_page(virt_to_head_page(buf)); > + else if (vi->big_packets) > + give_pages(rq, buf); > else > dev_kfree_skb(buf); > return; > -- > 1.8.5.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists