forked from pool/glibc
2debe4de02
- clntudp-call-alloca.patch: do not use alloca in clntudp_call (CVE-2016-4429, bsc#980854, BZ #20112) (forwarded request 398987 from Andreas_Schwab) OBS-URL: https://build.opensuse.org/request/show/398988 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=203
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
2016-05-23 Florian Weimer <fweimer@redhat.com>
|
|
|
|
CVE-2016-4429
|
|
[BZ #20112]
|
|
* sunrpc/clnt_udp.c (clntudp_call): Use malloc/free for the error
|
|
payload.
|
|
|
|
Index: glibc-2.23/sunrpc/clnt_udp.c
|
|
===================================================================
|
|
--- glibc-2.23.orig/sunrpc/clnt_udp.c
|
|
+++ glibc-2.23/sunrpc/clnt_udp.c
|
|
@@ -391,9 +391,15 @@ send_again:
|
|
struct sock_extended_err *e;
|
|
struct sockaddr_in err_addr;
|
|
struct iovec iov;
|
|
- char *cbuf = (char *) alloca (outlen + 256);
|
|
+ char *cbuf = malloc (outlen + 256);
|
|
int ret;
|
|
|
|
+ if (cbuf == NULL)
|
|
+ {
|
|
+ cu->cu_error.re_errno = errno;
|
|
+ return (cu->cu_error.re_status = RPC_CANTRECV);
|
|
+ }
|
|
+
|
|
iov.iov_base = cbuf + 256;
|
|
iov.iov_len = outlen;
|
|
msg.msg_name = (void *) &err_addr;
|
|
@@ -418,10 +424,12 @@ send_again:
|
|
cmsg = CMSG_NXTHDR (&msg, cmsg))
|
|
if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR)
|
|
{
|
|
+ free (cbuf);
|
|
e = (struct sock_extended_err *) CMSG_DATA(cmsg);
|
|
cu->cu_error.re_errno = e->ee_errno;
|
|
return (cu->cu_error.re_status = RPC_CANTRECV);
|
|
}
|
|
+ free (cbuf);
|
|
}
|
|
#endif
|
|
do
|