macvtap: fix TUNSETSNDBUF values > 64k
Subsystems (2)
PATCH 1/1 macvtap: fix TUNSETSNDBUF values > 64k
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.
---
This patch probably makes sense on stable.
drivers/net/macvtap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/macvtap.c +2 -2
@@ -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 :
Signature · 1 line
MST
Am 18.09.2015 um 12:41 schrieb Michael S. Tsirkin:
Quoted 9 lines
Upon TUNSETSNDBUF, macvtap reads the requested sndbuf size into a local variable u.
commit39ec7de7092b("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.
Quoted 6 lines
Cc David S. Miller <[email protected]>Fixes 39ec7de7092b ("macvtap: fix uninitialized access on TUNSETIFF")Reported-by Mark A. PeloquinBisected-by Matthew Rosato <[email protected]>Reported-by Christian Borntraeger <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
You can add
as this looks identical to an early version of my patch which was tested, by Matt. (I send you the other version that changes back u as I felt that u and up are named to identify unsigned)
and please add
what about
CC: [email protected]
Christian
Quoted 25 lines
---
This patch probably makes sense on stable.
drivers/net/macvtap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/macvtap.c +2
-2@@ -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 :
Quoted 23 lines · Christian Borntraeger
Am 18.09.2015 um 12:41 schrieb Michael S. Tsirkin:
Quoted 9 lines
Upon TUNSETSNDBUF, macvtap reads the requested sndbuf size into a local variable u.
commit39ec7de7092b("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.
Quoted 6 lines
Cc David S. Miller <[email protected]>Fixes 39ec7de7092b ("macvtap: fix uninitialized access on TUNSETIFF")Reported-by Mark A. PeloquinBisected-by Matthew Rosato <[email protected]>Reported-by Christian Borntraeger <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>You can add
Tested-by Matthew Rosato <[email protected]>as this looks identical to an early version of my patch which was tested, by Matt. (I send you the other version that changes back u as I felt that u and up are named to identify unsigned)
Quoted 7 lines
and please add
what about
CC: [email protected]Christian
David Miller adds that himself for netdev patches.
Quoted 25 lines
Quoted 25 lines
---
This patch probably makes sense on stable.
drivers/net/macvtap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/macvtap.c +2
-2@@ -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 :
David Miller
maintainerFrom: "Michael S. Tsirkin" <[email protected]>
Date: Fri, 18 Sep 2015 13:41:09 +0300
Quoted 9 lines
Upon TUNSETSNDBUF, macvtap reads the requested sndbuf size into a local variable u.
commit39ec7de7092b("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.
Quoted 6 lines
Cc David S. Miller <[email protected]>Fixes 39ec7de7092b ("macvtap: fix uninitialized access on TUNSETIFF")Reported-by Mark A. PeloquinBisected-by Matthew Rosato <[email protected]>Reported-by Christian Borntraeger <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
Applied and queued up for -stable, thanks.