Skip to contentSkip to conversation

Patch "macvtap: fix TUNSETSNDBUF values > 64k" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Sep 30, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

macvtap: fix TUNSETSNDBUF values > 64k

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
macvtap-fix-tunsetsndbuf-values-64k.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Sep 30 05:18:31 CEST 2015

From: "Michael S. Tsirkin" <[email protected]>
Date: Fri, 18 Sep 2015 13:41:09 +0300
Subject: macvtap: fix TUNSETSNDBUF values > 64k

From: "Michael S. Tsirkin" <[email protected]>

[ Upstream commit 3ea79249e81e5ed051f2e6480cbde896d99046e8 ]

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 <[email protected]>
Fixes 39ec7de7092b ("macvtap: fix uninitialized access on TUNSETIFF")
Reported-by Mark A. Peloquin
---
 drivers/net/macvtap.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/macvtap.c +2 -2
@@ -1054,10 +1054,10 @@ static long macvtap_ioctl(struct file *f
 		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:

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/macvtap-fix-tunsetsndbuf-values-64k.patch