db9712052c
* Mon Jan 24 2022 Florian Weimer <fweimer@redhat.com> - 2.34-21 - Sync with upstream branch release/2.34/master, commit 3438bbca90895d32825a52e31a77dc44d273c1c1: - Linux: Detect user namespace support in io/tst-getcwd-smallbuff - realpath: Avoid overwriting preexisting error - CVE-2021-3999: getcwd: Set errno to ERANGE for size == 1 - tst-realpath-toolong: Fix hurd build - CVE-2021-3998: realpath: ENAMETOOLONG for result larger than PATH_MAX - stdlib: Fix formatting of tests list in Makefile - stdlib: Sort tests in Makefile - support: Add helpers to create paths longer than PATH_MAX - powerpc: Fix unrecognized instruction errors with recent binutils - x86: use default cache size if it cannot be determined [BZ #28784] - CVE-2022-23218: Buffer overflow in sunrpc svcunix_create (bug 28768) - sunrpc: Test case for clnt_create "unix" buffer overflow (bug 22542) - CVE-2022-23219: Buffer overflow in sunrpc clnt_create for "unix" (bug 22542) - socket: Add the __sockaddr_un_set function - Disable debuginfod in printer tests [BZ #28757] - Update syscall lists for Linux 5.16 Resolves: #2032279 Resolves: #2032276
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
commit 7b5d433fd097b8ed74e458eca33597290e07b974
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Mon Jan 17 10:21:34 2022 +0100
|
|
|
|
CVE-2022-23219: Buffer overflow in sunrpc clnt_create for "unix" (bug 22542)
|
|
|
|
Processing an overlong pathname in the sunrpc clnt_create function
|
|
results in a stack-based buffer overflow.
|
|
|
|
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
(cherry picked from commit 226b46770c82899b555986583294b049c6ec9b40)
|
|
|
|
diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
|
|
index 13ced8994e49d4ee..b44357cd88e60599 100644
|
|
--- a/sunrpc/clnt_gen.c
|
|
+++ b/sunrpc/clnt_gen.c
|
|
@@ -57,9 +57,13 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
|
|
|
|
if (strcmp (proto, "unix") == 0)
|
|
{
|
|
- memset ((char *)&sun, 0, sizeof (sun));
|
|
- sun.sun_family = AF_UNIX;
|
|
- strcpy (sun.sun_path, hostname);
|
|
+ if (__sockaddr_un_set (&sun, hostname) < 0)
|
|
+ {
|
|
+ struct rpc_createerr *ce = &get_rpc_createerr ();
|
|
+ ce->cf_stat = RPC_SYSTEMERROR;
|
|
+ ce->cf_error.re_errno = errno;
|
|
+ return NULL;
|
|
+ }
|
|
sock = RPC_ANYSOCK;
|
|
client = clntunix_create (&sun, prog, vers, &sock, 0, 0);
|
|
if (client == NULL)
|