f502fbbdd4444938b7 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Mon, 23 Jan 2017 21:37:52 +0200
Subject: virtio_net: fix PAGE_SIZE > 64k

I don't have any guests with PAGE_SIZE > 64k but the
code seems to be clearly broken in that case
as PAGE_SIZE / MERGEABLE_BUFFER_ALIGN will need
more than 8 bit and so the code in mergeable_ctx_to_buf_address
does not give us the actual true size.

Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/virtio_net.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

 id='cgit'><table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/cgit.cgi/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/cgit.cgi/'>index</a> : <a href='/cgit.cgi/linux/net-next.git/'>net-next.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='0c4881ced8d2e380d0544f1e7e3249d7bbc45979'/><select name='h' onchange='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>refs</a><a class='active' href='/cgit.cgi/linux/net-next.git/log/tools/include/asm-generic/bitops'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/tools/include/asm-generic/bitops?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>tree</a><a href='/cgit.cgi/linux/net-next.git/commit/tools/include/asm-generic/bitops?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/tools/include/asm-generic/bitops?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/tools/include/asm-generic/bitops'>
<input type='hidden' name='id' value='0c4881ced8d2e380d0544f1e7e3249d7bbc45979'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/log/?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>root</a>/<a href='/cgit.cgi/linux/net-next.git/log/tools?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>tools</a>/<a href='/cgit.cgi/linux/net-next.git/log/tools/include?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>include</a>/<a href='/cgit.cgi/linux/net-next.git/log/tools/include/asm-generic?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>asm-generic</a>/<a href='/cgit.cgi/linux/net-next.git/log/tools/include/asm-generic/bitops?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979'>bitops</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit.cgi/linux/net-next.git/log/tools/include/asm-generic/bitops?id=0c4881ced8d2e380d0544f1e7e3249d7bbc45979&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
3c4ae1be3d5d0f804&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>