[PATCH] macvtap: fix TUNSETSNDBUF values > 64k

From	"Michael S. Tsirkin" <mst@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] macvtap: fix TUNSETSNDBUF values > 64k
Date	2015-09-18 12:50 +0200
Message-ID	<qa1oR-cV-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Upon TUNSETSNDBUF,  macvtap reads the requested sndbuf size into
a local variable u.
commit 39ec7de7092b ("macvtap: fix uninitialized access on
TUNSETIFF") changed its type to u16 (which is the right thing to
do for all other macvtap ioctls), breaking all values > 64k.

The value of TUNSETSNDBUF is actually a signed 32 bit integer, so
the right thing to do is to read it into an int.

Cc: David S. Miller <davem@davemloft.net>
Fixes: 39ec7de7092b ("macvtap: fix uninitialized access on TUNSETIFF")
Reported-by: Mark A. Peloquin
Bisected-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

This patch probably makes sense on stable.

 drivers/net/macvtap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index edd7734..248478c 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1111,10 +1111,10 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
 		return 0;
 
 	case TUNSETSNDBUF:
-		if (get_user(u, up))
+		if (get_user(s, sp))
 			return -EFAULT;
 
-		q->sk.sk_sndbuf = u;
+		q->sk.sk_sndbuf = s;
 		return 0;
 
 	case TUNGETVNETHDRSZ:
-- 
MST
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] macvtap: fix TUNSETSNDBUF values > 64k "Michael S. Tsirkin" <mst@redhat.com> - 2015-09-18 12:50 +0200
  Re: [PATCH] macvtap: fix TUNSETSNDBUF values > 64k Christian Borntraeger <borntraeger@de.ibm.com> - 2015-09-18 12:50 +0200
    Re: [PATCH] macvtap: fix TUNSETSNDBUF values > 64k "Michael S. Tsirkin" <mst@redhat.com> - 2015-09-18 13:00 +0200
  Re: [PATCH] macvtap: fix TUNSETSNDBUF values > 64k David Miller <davem@davemloft.net> - 2015-09-21 07:50 +0200

csiph-web