ipv4: clamp MCAST_MSFILTER getsockopt to optlen, not gf_numsrc
Subsystems (3)
PATCH 1/1 ipv4: clamp MCAST_MSFILTER getsockopt to optlen, not gf_numsrc
ip_get_mcast_msfilter() and its compat sibling read gf_numsrc from the user's buffer header and pass it to ip_mc_gsfget(), which writes:
min(actual_sources, gf_numsrc) * sizeof(struct sockaddr_storage)
bytes back into the user's optval starting at the gf_slist_flex offset. The only optlen check is len >= size0 (the header), so a user can pass optlen = 144 (header only) with gf_numsrc = 4. If the socket has at least 4 sources joined, the kernel writes 4*128 = 512 bytes via copy_to_sockptr_offset() past the end of the user buffer.
This is a kernel-driven userspace heap overflow: the user told the kernel their buffer size via optlen, the kernel ignored it and used a field inside the buffer instead. On a real system the writes go into adjacent userspace heap and copy_to_user does not fault on mapped heap pages.
Clamp gf_numsrc to (len - size0) / sizeof(sockaddr_storage) before the call so the kernel never writes past what the user provided. The setsockopt path already has the equivalent check (GROUP_FILTER_SIZE(gf_numsrc) > optlen at line 790).
--- net/ipv4/ip_sockglue.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/ipv4/ip_sockglue.c +10 -1
@@ -1456,6 +1456,11 @@ static int ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval,return -EFAULT ; num = gsf.gf_numsrc; + +if (num > (len - size0) /sizeof (struct sockaddr_storage )) + num = (len - size0) /sizeof (struct sockaddr_storage ); + gsf.gf_numsrc = num; + err =ip_mc_gsfget (sk, &gsf, optval, offsetof(struct group_filter , gf_slist_flex));if (err)
@@ -1486,8 +1491,12 @@ static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, gf.gf_interface = gf32.gf_interface; gf.gf_fmode = gf32.gf_fmode; num = gf.gf_numsrc = gf32.gf_numsrc; - gf.gf_group = gf32.gf_group; +if (num > (len - size0) /sizeof (struct sockaddr_storage )) + num = (len - size0) /sizeof (struct sockaddr_storage ); + gf.gf_numsrc = num; + + gf.gf_group = gf32.gf_group; err =ip_mc_gsfget (sk, &gf, optval, offsetof(struct compat_group_filter , gf_slist_flex));if (err)
Signature · 1 line
2.53.0
Paolo Abeni
maintainernet/ipv4/ip_sockglue.c static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, · line 1497
Quoted 9 lines · Greg Kroah-Hartman
net/ipv4/ip_sockglue.c +3
-1@@ -1486,8 +1491,12 @@ static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, gf.gf_interface = gf32.gf_interface; gf.gf_fmode = gf32.gf_fmode; num = gf.gf_numsrc = gf32.gf_numsrc; - gf.gf_group = gf32.gf_group; +if (num > (len - size0) /sizeof (struct sockaddr_storage )) + num = (len - size0) /sizeof (struct sockaddr_storage ); + gf.gf_numsrc = num;
Since this is exactly the same code added above, likely a common helper would be useful.
I guess we don't care if this would break bad application passing optval area properly sized for gf_numsrc sockets and a small optval, right? I don't see how to eventually save them.
/P
Quoted 7 lines · Paolo Abeni
Quoted 6 lines · Greg Kroah-Hartman
net/ipv4/ip_sockglue.c +0
-1@@ -1486,8 +1491,12 @@ static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, gf.gf_interface = gf32.gf_interface; gf.gf_fmode = gf32.gf_fmode; num = gf.gf_numsrc = gf32.gf_numsrc; - gf.gf_group = gf32.gf_group;
Quoted 6 lines
net/ipv4/ip_sockglue.c static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, · line 1497
Quoted 3 lines
net/ipv4/ip_sockglue.c +3
-0+if (num > (len - size0) /sizeof (struct sockaddr_storage )) + num = (len - size0) /sizeof (struct sockaddr_storage ); + gf.gf_numsrc = num;Since this is exactly the same code added above, likely a common helper would be useful.
Useful where else?
Quoted 3 lines
I guess we don't care if this would break bad application passing optval area properly sized for
gf_numsrcsockets and a small optval, right? I don't see how to eventually save them.
I couldn't see how to save them either, and if an application sends bad data we should be rejecting it, right? Especially as this overflows things as-is :(
thanks,
greg k-h
Paolo Abeni
maintainerQuoted 8 lines · Greg Kroah-Hartman
Quoted 7 lines · Paolo Abeni
Quoted 6 lines · Greg Kroah-Hartman
net/ipv4/ip_sockglue.c +0
-1@@ -1486,8 +1491,12 @@ static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, gf.gf_interface = gf32.gf_interface; gf.gf_fmode = gf32.gf_fmode; num = gf.gf_numsrc = gf32.gf_numsrc; - gf.gf_group = gf32.gf_group;
Quoted 8 lines
Quoted 6 lines
net/ipv4/ip_sockglue.c static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, · line 1497
Quoted 3 lines
net/ipv4/ip_sockglue.c +3
-0+if (num > (len - size0) /sizeof (struct sockaddr_storage )) + num = (len - size0) /sizeof (struct sockaddr_storage ); + gf.gf_numsrc = num;Since this is exactly the same code added above, likely a common helper would be useful.
Useful where else?
Just in these 2 functions, to avoid duplicating the logic.
Not a big deal, but it would feel nicer. Also the
gf.gf_group = gf32.gf_group;
statement is moved around but such change is not needed, right?
Quoted 7 lines
Quoted 3 lines
I guess we don't care if this would break bad application passing optval area properly sized for
gf_numsrcsockets and a small optval, right? I don't see how to eventually save them.I couldn't see how to save them either, and if an application sends bad data we should be rejecting it, right? Especially as this overflows things as-is :(
Agreed.
Thanks,
Paolo
Quoted 18 lines · Paolo Abeni
Quoted 8 lines · Greg Kroah-Hartman
Quoted 7 lines · Paolo Abeni
Quoted 6 lines · Greg Kroah-Hartman
net/ipv4/ip_sockglue.c +0
-1@@ -1486,8 +1491,12 @@ static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, gf.gf_interface = gf32.gf_interface; gf.gf_fmode = gf32.gf_fmode; num = gf.gf_numsrc = gf32.gf_numsrc; - gf.gf_group = gf32.gf_group;Quoted 8 lines
Quoted 6 lines
net/ipv4/ip_sockglue.c static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval, · line 1497
Quoted 3 lines
net/ipv4/ip_sockglue.c +3
-0+if (num > (len - size0) /sizeof (struct sockaddr_storage )) + num = (len - size0) /sizeof (struct sockaddr_storage ); + gf.gf_numsrc = num;Since this is exactly the same code added above, likely a common helper would be useful.
Useful where else?
Quoted 7 lines
Just in these 2 functions, to avoid duplicating the logic.
Not a big deal, but it would feel nicer. Also the
gf.gf_group = gf32.gf_group;statement is moved around but such change is not needed, right?
It's just moved down, I inserted the check/assignment before that line, and git diff shows that as remove/add for some reason :(
thansk,
greg k-h